#OBS-I116: Dataset CRUD apis test fixes

api-service/src/v2/controllers/DatasetStatusTransition/DatasetStatusTransition.ts

@@ -34,7 +34,7 @@ const validateRequest =  (req: Request, datasetId: any) => {
 const validateDataset = (dataset: any, datasetId: any, action: string) => {
 
     if (_.isEmpty(dataset)) {
-        throw obsrvError(datasetId, datasetNotFound, `Dataset not found for dataset: ${dataset.id}`, "NOT_FOUND", 404)
+        throw obsrvError(datasetId, datasetNotFound, `Dataset not found for dataset: ${datasetId}`, "NOT_FOUND", 404)
     }
 
     if (dataset.api_version !== "v2" && _.includes(["ReadyToPublish", "Live"], action)) {
@@ -54,7 +54,7 @@ const datasetStatusTransition = async (req: Request, res: Response) => {
     const { dataset_id, status } = _.get(req.body, "request");
     validateRequest(req, dataset_id);
 
-    const dataset:Record<string, any> = (_.includes(liveDatasetActions, status)) ? await datasetService.getDataset(dataset_id, ["id", "status", "type"], true) : await datasetService.getDraftDataset(dataset_id, ["id", "dataset_id", "status", "type"])
+    const dataset:Record<string, any> = (_.includes(liveDatasetActions, status)) ? await datasetService.getDataset(dataset_id, ["id", "status", "type", "api_version"], true) : await datasetService.getDraftDataset(dataset_id, ["id", "dataset_id", "status", "type", "api_version"])
     validateDataset(dataset, dataset_id, status);
 
     switch(status) {

api-service/src/v2/controllers/DatasetStatusTransition/ReadyToPublishSchema.json

@@ -18,7 +18,7 @@
     },
     "type": {
       "type": "string",
-      "enum": ["dataset", "master-dataset"]
+      "enum": ["event", "transaction", "master"]
     },
     "name": {
       "type": "string",
@@ -305,7 +305,7 @@
       }
     },
     "sample_data": {
-      "type": "string"
+      "type": "object"
     },
     "transformations_config": {
       "type": "array",

api-service/src/v2/models/Dataset.ts

@@ -71,6 +71,10 @@ export const Dataset = sequelize.define("datasets", {
     sample_data: {
         type: DataTypes.JSON,
         defaultValue: {}
+    },
+    entry_topic: {
+        type: DataTypes.STRING,
+        allowNull: false
     }
 }, {
     tableName: "datasets",

api-service/src/v2/models/DatasetDraft.ts

@@ -99,8 +99,12 @@ export const DatasetDraft = sequelize.define("datasets_draft", {
     defaultValue: "v2"
   },
   sample_data: {
-      type: DataTypes.JSON,
-      defaultValue: {}
+    type: DataTypes.JSON,
+    defaultValue: {}
+  },
+  entry_topic: {
+    type: DataTypes.STRING,
+    allowNull: false
   }
 }, {
   timestamps: true,

api-service/src/v2/services/TableGenerator.ts

@@ -48,13 +48,13 @@ class BaseTableGenerator {
      * @param denorm_config 
      * @returns Promise<Record<string, any>[]>
      */
-    getAllFields = async (dataset: Record<string, any>, type: string) : Promise<Record<string, any>[]> => {
+    getAllFields = async (dataset: Record<string, any>, type: string): Promise<Record<string, any>[]> => {
 
-        const { data_schema, denorm_config, transformations_config} = dataset
+        const { data_schema, denorm_config, transformations_config } = dataset
         const instance = this;
         let dataFields = instance.flattenSchema(data_schema, type);
-        if(denorm_config.denorm_fields) {
-            _.map(denorm_config.denorm_fields, async (denormField) => {
+        if (!_.isEmpty(denorm_config.denorm_fields)) {
+            for (const denormField of denorm_config.denorm_fields) {
                 const denormDataset: any = await datasetService.getDataset(denormField.dataset_id, ["data_schema"], true);
                 const properties = instance.flattenSchema(denormDataset.data_schema, type);
                 const transformProps = _.map(properties, (prop) => {
@@ -63,21 +63,21 @@ class BaseTableGenerator {
                     return prop;
                 });
                 dataFields.push(...transformProps);
-            })
+            }
         }
-        if(transformations_config) {
-            _.map(transformations_config, async (tf) => {
-                dataFields.push({
-                    expr: "$." + tf.field_key,
-                    name: tf.field_key,
-                    data_type: tf.transformation_function.datatype,
-                    arrival_format: tf.transformation_function.datatype,
-                    type: tf.transformation_function.datatype
-                })
-            })
+        if (!_.isEmpty(transformations_config)) {
+            const transformationFields = _.map(transformations_config, (tf) => ({
+                expr: "$." + tf.field_key,
+                name: tf.field_key,
+                data_type: tf.transformation_function.datatype,
+                arrival_format: tf.transformation_function.datatype,
+                type: tf.transformation_function.datatype
+            }))
+            const originalFields = _.differenceBy(dataFields, transformationFields, "name")
+            dataFields = _.concat(originalFields, transformationFields)
         }
         dataFields.push(rawIngestionSpecDefaults.synctsField)
-        _.remove(dataFields, {is_deleted: true}) // Delete all the excluded fields
+        _.remove(dataFields, { is_deleted: true }) // Delete all the excluded fields
         return dataFields;
     }
 }