Merge branch 'main' into feature/dev

Author: rakibansary

.circleci/config.yml

@@ -6,7 +6,7 @@ jobs:
     - image: cimg/aws:2023.01
     environment:
       CODEARTIFACT_ENV: PROD
-      ECR_ENV: DEV
+      ECR_ENV: QA
       SERVICE_NAME: "domain-challenge"
       OUT_DIR: "buildscripts"
     steps:

src/domain/Challenge.ts

@@ -340,24 +340,22 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
             await legacyPhaseDomain.updateProjectPhase({
               projectPhaseId: phase.projectPhaseId,
               phaseStatusId: newStatus,
-              fixedStartTime: moment(phase.fixedStartTime).format(
-                "yyyy-MM-DD HH:mm:ss"
-              )
-                ? moment(v5Equivalent.scheduledStartDate).format(
-                    "yyyy-MM-DD HH:mm:ss"
-                  )
-                : undefined,
+              ...(phaseOrder === 0 ? {
+                fixedStartTime: moment(phase.fixedStartTime).format(
+                  "yyyy-MM-DD HH:mm:ss"
+                )
+                  ? moment(v5Equivalent.scheduledStartDate).format(
+                      "yyyy-MM-DD HH:mm:ss"
+                    )
+                  : undefined,
+              } : {}),
               scheduledStartTime: moment(
                 v5Equivalent.scheduledStartDate
               ).format("yyyy-MM-DD HH:mm:ss"),
               scheduledEndTime: moment(v5Equivalent.scheduledEndDate).format(
                 "yyyy-MM-DD HH:mm:ss"
               ),
               duration: v5Equivalent.duration * 1000,
-              ...(isBeingActivated &&
-              newStatus == constants.PhaseStatusTypes.Open
-                ? { actualStartTime: moment().format("yyyy-MM-DD HH:mm:ss") }
-                : {}),
             });
           } else {
             console.log(`number of ${phaseName} does not match`);
@@ -964,7 +962,8 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
     const createdByUserId = 22838965; // TODO: Extract from interceptors
     const updatedByUserId = 22838965; // TODO: Extract from interceptors
 
-    if (!input?.legacyId) {
+    if (!input?.legacyId && input?.status && input?.status !== ChallengeStatuses.New) {
+      console.log(`Legacy ID does not exist. Creating challenge in legacy...`);
       const { track, subTrack, isTask, technologies } =
         legacyMapper.mapTrackAndType(
           input.trackId as string,
@@ -1003,6 +1002,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
       input.legacyId = legacyChallengeId as number;
     }
 
+    console.log(`Updating challenge in legacy...`);
     if (input?.legacyId) {
       const legacyId = input.legacyId;
       const legacyChallenge = await legacyChallengeDomain.getLegacyChallenge({
@@ -1251,6 +1251,7 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
         }
       }
     }
+    console.log("Challenge updated successfully in legacy");
 
     // toEntity parses the below properties thus we should now stringify them again
     // for (const key of ["phases",
@@ -1261,16 +1262,14 @@ class ChallengeDomain extends CoreOperations<Challenge, CreateChallengeInput> {
     //   "prizeSets"]) {
     //     _.set(input, key, JSON.stringify(_.get(input, key)))
     //   }
-    //   console.log('------ before save --------');
+    console.log('------ before save --------');
 
     //   console.log(input);
     console.log(_.omit(input, ["id"]));
 
     const challengeList = await super.update(scanCriteria, {
-      ..._.omit(input, ["id"]),
-      ...(input.prizeSets
-        ? { prizeSets: input.prizeSets.map((ps) => JSON.stringify(ps)) }
-        : {}),
+      ..._.omit(input, ["id", ...(!input.legacyId ? ["legacyId"] : [])]),
+      // prizeSets: input.prizeSets.map((ps) => JSON.stringify(ps)),
     });
 
     console.log("------ after save --------");

src/schema/Challenge.ts

@@ -33,7 +33,7 @@ export const ChallengeSchema = {
     },
     {
       name: "billing",
-      type: DataType.DATA_TYPE_STRING,
+      type: DataType.DATA_TYPE_MAP,
     },
     {
       name: "description",
@@ -53,7 +53,7 @@ export const ChallengeSchema = {
     },
     {
       name: "task",
-      type: DataType.DATA_TYPE_STRING,
+      type: DataType.DATA_TYPE_MAP,
     },
     {
       name: "timelineTemplateId",
@@ -69,7 +69,7 @@ export const ChallengeSchema = {
     },
     {
       name: "prizeSets",
-      type: DataType.DATA_TYPE_STRING_SET,
+      type: DataType.DATA_TYPE_LIST,
     },
     {
       name: "tags",
@@ -125,7 +125,7 @@ export const ChallengeSchema = {
     },
     {
       name: "overview",
-      type: DataType.DATA_TYPE_STRING,
+      type: DataType.DATA_TYPE_MAP,
     },
   ],
   indices: {

src/util/LegacyMapper.ts

@@ -36,8 +36,9 @@ class LegacyMapper {
             : undefined, // Registration Phase needs a fixedStartTime
         scheduledStartTime: DateUtil.formatDateForIfx(phase.scheduledStartDate),
         scheduledEndTime: DateUtil.formatDateForIfx(phase.scheduledEndDate),
-        actualStartTime: DateUtil.formatDateForIfx(phase.actualStartDate),
-        actualEndTime: DateUtil.formatDateForIfx(phase.actualEndDate),
+        // TODO: Confirm this is correct
+        // actualStartTime: DateUtil.formatDateForIfx(phase.actualStartDate),
+        // actualEndTime: DateUtil.formatDateForIfx(phase.actualEndDate),
         duration: phase.duration,
         phaseCriteria: this.mapPhaseCriteria(phase),
       })),