Merge remote-tracking branch 'upstream/main' into open-source-rebase

Sunbird-Obsrv · Nov 13, 2024 · 3fce107 · 3fce107
2 parents 40b33f2 + b9174ea
commit 3fce107
Showing 1 changed file with 2 additions and 6 deletions.
diff --git a/api-service/src/controllers/DatasetImport/DatasetImport.ts b/api-service/src/controllers/DatasetImport/DatasetImport.ts
@@ -15,22 +15,18 @@ const datasetImport = async (req: Request, res: Response) => {
         const migratedConfigs = migrateExportedDatasetV1(requestBody)
         datasetPayload = migratedConfigs;
     }
-    const userID = (req as any)?.userID;
-    _.set(datasetPayload, "created_by", userID);
-    _.set(datasetPayload, "updated_by", userID);
     const { updatedDataset, ignoredFields } = await datasetImportValidation({ ...requestBody, "request": datasetPayload })
     const { successMsg, partialIgnored } = getResponseData(ignoredFields)
 
-    const dataset = await importDataset(updatedDataset, overwrite, userID);
+    const dataset = await importDataset(updatedDataset, overwrite);
     ResponseHandler.successResponse(req, res, { status: httpStatus.OK, data: { message: successMsg, data: dataset, ...(!_.isEmpty(partialIgnored) && { ignoredFields: partialIgnored }) } });
 }
 
-const importDataset = async (dataset: Record<string, any>, overwrite: string | any, userID : string) => {
+const importDataset = async (dataset: Record<string, any>, overwrite: string | any) => {
     const dataset_id = _.get(dataset,"dataset_id")
     const response = await datasetService.createDraftDataset(dataset).catch(err => { return err })
     if (response?.name === "SequelizeUniqueConstraintError") {
         if (overwrite === "true") {
-            _.set(dataset, "updated_by", userID);
             const overwriteRes = await datasetService.updateDraftDataset(dataset).catch(()=>{
                 throw obsrvError(dataset_id, "DATASET_IMPORT_FAILURE", `Failed to import dataset: ${dataset_id} as overwrite failed`, "INTERNAL_SERVER_ERROR", 500);
             })