Merge pull request #199 from Sanketika-Obsrv/#234api-integration

Sanketika-Obsrv/issue-tracker#OBS-151: dataset create and update schema for file_upload_path prop support
Sanketika-Obsrv · Jun 28, 2024 · 334f317 · 334f317
2 parents 5adbe2c + 7601bf6
commit 334f317
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 22 deletions.
diff --git a/api-service/src/v2/configs/DatasetConfigDefault.ts b/api-service/src/v2/configs/DatasetConfigDefault.ts
@@ -38,7 +38,7 @@ export const defaultMasterConfig = {
         "redis_db_port": config.redis_config.denorm_redis_port,
         "index_data": true,
         "redis_db": 3,
-        "file_upload_path": []
+        "files_upload_path": []
     },
     "status": DatasetStatus.Draft,
     "version": 1,
@@ -82,7 +82,7 @@ export const defaultDatasetConfig = {
         "redis_db_port": config.redis_config.dedup_redis_port,
         "index_data": true,
         "redis_db": 0,
-        "file_upload_path": []
+        "files_upload_path": []
     },
     "status": DatasetStatus.Draft,
     "api_version": "v2",

diff --git a/api-service/src/v2/controllers/DatasetCreate/DatasetCreateValidationSchema.json b/api-service/src/v2/controllers/DatasetCreate/DatasetCreateValidationSchema.json
@@ -154,15 +154,14 @@
               "type": "string",
               "minLength": 1
             },
-            "file_upload_path": {
+            "files_upload_path": {
               "type": "array",
               "items": {
                 "type": "string",
                 "minLength": 1
               }
             }
           },
-          "required": ["data_key", "timestamp_key"],
           "additionalProperties": false
         },
         "transformations_config": {
@@ -201,21 +200,14 @@
               },
               "mode": {
                 "type": "string",
-                "enum": [
-                  "Strict",
-                  "Lenient"
-                ]
+                "enum": ["Strict", "Lenient"]
               },
               "metadata": {
                 "type": "object"
               }
             },
             "additionalProperties": false,
-            "required": [
-              "field_key",
-              "transformation_function",
-              "mode"            
-            ]
+            "required": ["field_key", "transformation_function", "mode"]
           }
         },
         "tags": {
@@ -232,4 +224,4 @@
   },
   "required": ["id", "ver", "ts", "params", "request"],
   "additionalProperties": false
-}
+}
diff --git a/api-service/src/v2/controllers/DatasetStatusTransition/ReadyToPublishSchema.json b/api-service/src/v2/controllers/DatasetStatusTransition/ReadyToPublishSchema.json
@@ -260,7 +260,7 @@
         "redis_db": {
           "type": "integer"
         },
-        "file_upload_path": {
+        "files_upload_path": {
           "type": "array",
           "items": {
             "type": "string",

diff --git a/api-service/src/v2/controllers/DatasetUpdate/DatasetUpdateValidationSchema.json b/api-service/src/v2/controllers/DatasetUpdate/DatasetUpdateValidationSchema.json
@@ -195,7 +195,7 @@
             "dataMappings": {
               "type": "object"
             },
-            "file_upload_path": {
+            "files_upload_path": {
               "type": "array",
               "items": {
                 "type": "string",

diff --git a/api-service/src/v2/tests/DatasetManagement/DatasetCreate/Fixtures.ts b/api-service/src/v2/tests/DatasetManagement/DatasetCreate/Fixtures.ts
@@ -52,7 +52,7 @@ export const TestInputsForDatasetCreate = {
             "dataset_config": {
                 "data_key": "",
                 "timestamp_key": "ets",
-                "file_upload_path": ["/config/file.json"]
+                "files_upload_path": ["/config/file.json"]
             },
             "tags": []
         }
@@ -126,7 +126,7 @@ export const TestInputsForDatasetCreate = {
             "dataset_config": {
                 "data_key": "",
                 "timestamp_key": "ets",
-                "file_upload_path": ["/config/file.json"]
+                "files_upload_path": ["/config/file.json"]
             },
             "transformations_config": [
                 {
@@ -182,7 +182,7 @@ export const TestInputsForDatasetCreate = {
             "dataset_config": {
                 "data_key": "",
                 "timestamp_key": "ets",
-                "file_upload_path": ["/config/file.json"]
+                "files_upload_path": ["/config/file.json"]
             },
             "transformations_config": [
                 {

diff --git a/api-service/src/v2/tests/DatasetManagement/DatasetUpdate/Fixtures.ts b/api-service/src/v2/tests/DatasetManagement/DatasetUpdate/Fixtures.ts
@@ -193,7 +193,7 @@ export const TestInputsForDatasetUpdate = {
             "dataset_config": {
                 "data_key": "eid",
                 "timestamp_key": "ets",
-                "file_upload_path": ["/config/file.json"]
+                "files_upload_path": ["/config/file.json"]
             }
         }
     },
@@ -356,7 +356,7 @@ export const TestInputsForDatasetUpdate = {
             "dataset_config": {
                 "data_key": "mid",
                 "timestamp_key": "ets",
-                "file_upload_path": ["/config/file.json"]
+                "files_upload_path": ["/config/file.json"]
             },
             "tags": [
                 {

diff --git a/api-service/swagger-doc/openapi_v2.yml b/api-service/swagger-doc/openapi_v2.yml
@@ -78,6 +78,7 @@ paths:
                     denorm_fields:
                       - denorm_key: eid
                         denorm_out_field: userdata
+                        dataset_id: master-telemetry
                   transformations_config:
                     - field_key: eid
                       transformation_function:
@@ -93,6 +94,7 @@ paths:
                   dataset_config:
                     data_key: mid
                     timestamp_key: ets
+                    files_upload_path: ["telemetry.json"]
                   tags:
                     - tag1
                     - tag2
@@ -261,10 +263,12 @@ paths:
                       - values:
                           denorm_key: eid
                           denorm_out_field: userdata
+                          dataset_id: master-telemetry
                         action: remove
                       - values:
                           denorm_key: eid
                           denorm_out_field: edata
+                          dataset_id: trip-record
                         action: add
                   transformation_config:
                     - values:
@@ -975,7 +979,7 @@ paths:
                         redis_db_port: 6379
                         index_data: true
                         redis_db: 70
-                        file_upload_path: []
+                        files_upload_path: []
                         configurations:
                           indexConfiguration:
                             index: