feat #OBS-I568 : set datasource as dataset_id if v1

Author: JeraldJF

api-service/src/services/DatasetService.ts

@@ -344,14 +344,17 @@ class DatasetService {
 
     private updateDruidDataSource = async (draftDataset: Record<string, any>, transaction: Transaction, existingDatasource: Record<string, any>) => {
 
-        const { created_by, updated_by } = draftDataset;
+        const { created_by, updated_by, dataset_id, api_version } = draftDataset;
         const allFields = await tableGenerator.getAllFields(draftDataset, "druid");
         const ingestionSpec = tableGenerator.getDruidIngestionSpec(draftDataset, allFields, existingDatasource.datasource_ref);
         let draftDatasource = existingDatasource
         _.set(draftDatasource, "ingestion_spec", ingestionSpec)
         _.set(draftDatasource, "created_by", created_by);
         _.set(draftDatasource, "updated_by", updated_by);
         _.set(draftDatasource, "type", "druid");
+        if (api_version === "v1") {
+            _.set(draftDatasource, "datasource", dataset_id)
+        }
         await DatasourceDraft.upsert(draftDatasource, { transaction })
     }
 

command-service/src/command/db_command.py

@@ -190,6 +190,7 @@ def _insert_datasource_record(self, dataset_id, draft_dataset_id):
                 json.dumps(draft_datasource.metadata).replace("'", "''"),
 
                 draft_datasource.datasource_ref,
+                draft_datasource.datasource,
                 json.dumps(draft_datasource.ingestion_spec),
                 draft_datasource.type,
                 json.dumps(draft_datasource.retention_period).replace("'", "''"),
@@ -227,6 +228,7 @@ def _insert_datasource_record(self, dataset_id, draft_dataset_id):
                 )
                 ON CONFLICT (id) DO UPDATE
                 SET datasource_ref = %s,
+                datasource = %s,
                 ingestion_spec = %s,
                 type = %s,
                 retention_period = %s,