fixes for challenge update

Author: ThomasKranitsas

src/config/constants.ts

@@ -52,7 +52,7 @@ export const ResourceInfoTypeIds = {
   ManualPayments: 15,
 };
 
-export type ResourceInfoTypeIds = keyof typeof ResourceInfoTypeIds;
+type ResourceInfoTypeIds = keyof typeof ResourceInfoTypeIds;
 
 export const ObserverResourceInfoToAdd: ResourceInfoTypeIds[] = [
   "ExternalReferenceId",

src/domain/LegacyChallenge.ts

@@ -568,7 +568,6 @@ class LegacyChallengeDomain {
             intValue: input.legacyChallengeId,
           },
         })
-        .limit(1)
         .build()
     );
     if (!rows || rows.length === 0)
@@ -587,7 +586,6 @@ class LegacyChallengeDomain {
           intValue: legacyChallengeId,
         },
       })
-      .limit(1)
       .build();
 
     const { rows } = await queryRunner.run(query);

src/domain/LegacyChallengePhase.ts

@@ -28,7 +28,6 @@ class LegacyChallengePhaseDomain {
   public async getPhaseTypes(): Promise<PhaseTypeList> {
     const query = new QueryBuilder(PhaseTypeSchema)
       .select(PhaseTypeSchema.columns.phaseTypeId, PhaseTypeSchema.columns.name)
-      .limit(500)
       .build();
 
     const { rows: projectPhases } = await queryRunner.run(query);

src/domain/LegacyPhase.ts

@@ -24,10 +24,9 @@ import { PhaseTypeSchema } from "../schema/project/PhaseType";
 import { ProjectPhaseSchema } from "../schema/project/ProjectPhase";
 
 class LegacyPhaseDomain {
-  public async getPhaseTypes(): Promise<PhaseTypeList | undefined> {
+  public async getPhaseTypes(): Promise<PhaseTypeList> {
     const query = new QueryBuilder(PhaseTypeSchema)
-      .select(..._.map(PhaseTypeSchema.columns))
-      .limit(500)
+      .select(PhaseTypeSchema.columns.name, PhaseTypeSchema.columns.phaseTypeId)
       .build();
 
     const { rows } = await queryRunner.run(query);
@@ -49,7 +48,6 @@ class LegacyPhaseDomain {
           intValue: input.phaseCriteriaTypeId!,
         },
       })
-      .limit(500)
       .build();
 
     const { rows } = await queryRunner.run(query);

src/domain/ProjectInfo.ts

@@ -1,4 +1,5 @@
 import { Operator, QueryBuilder } from "@topcoder-framework/client-relational";
+import { UpdateResult } from "@topcoder-framework/lib-common";
 import { queryRunner } from "../helper/QueryRunner";
 import {
   CreateProjectInfoInput,
@@ -30,11 +31,11 @@ class ProjectInfoDomain {
   }
 
   // TODO: Test this after informix-access-layer is fixed
-  public async update(input: UpdateProjectInfoInput): Promise<ProjectInfo | undefined> {
-    const { rows } = await queryRunner.run(
+  public async update(input: UpdateProjectInfoInput): Promise<UpdateResult> {
+    const res = await queryRunner.run(
       new QueryBuilder(ProjectInfoSchema)
         .update({
-          projectId: input.projectId,
+          value: input.value,
           modifyUser: input.modifyUser,
         })
         .where(ProjectInfoSchema.columns.projectId, Operator.OPERATOR_EQUAL, {
@@ -43,9 +44,17 @@ class ProjectInfoDomain {
             intValue: input.projectId,
           },
         })
+        .andWhere(ProjectInfoSchema.columns.projectInfoTypeId, Operator.OPERATOR_EQUAL, {
+          value: {
+            $case: "intValue",
+            intValue: input.projectInfoTypeId
+          }
+        })
         .build()
     );
-    return rows?.length ? ProjectInfo.fromPartial(rows[0] as ProjectInfo) : undefined;
+    return {
+      updatedCount: res.affectedRows!
+    };
   }
 
   public async delete(input: DeleteProjectInfoInput) {
@@ -69,25 +78,29 @@ class ProjectInfoDomain {
   }
 
   public async getProjectInfo(input: GetProjectInfoInput): Promise<ProjectInfoList> {
+    let query = new QueryBuilder(ProjectInfoSchema)
+    .select(
+      ProjectInfoSchema.columns.projectId,
+      ProjectInfoSchema.columns.projectInfoTypeId,
+      ProjectInfoSchema.columns.value
+    )
+    .where(ProjectInfoSchema.columns.projectId, Operator.OPERATOR_EQUAL, {
+      value: {
+        $case: "intValue",
+        intValue: input.projectId,
+      },
+    })
+    if (input.projectInfoTypeId) {
+      query = query
+      .andWhere(ProjectInfoSchema.columns.projectInfoTypeId, Operator.OPERATOR_EQUAL, {
+        value: {
+          $case: "intValue",
+          intValue: input.projectInfoTypeId!,
+        },
+      })
+    }
     const { rows } = await queryRunner.run(
-      new QueryBuilder(ProjectInfoSchema)
-        .select(
-          ProjectInfoSchema.columns.projectId,
-          ProjectInfoSchema.columns.projectInfoTypeId,
-          ProjectInfoSchema.columns.value
-        )
-        .where(ProjectInfoSchema.columns.projectId, Operator.OPERATOR_EQUAL, {
-          value: {
-            $case: "intValue",
-            intValue: input.projectId,
-          },
-        })
-        .andWhere(ProjectInfoSchema.columns.projectInfoTypeId, Operator.OPERATOR_EQUAL, {
-          value: {
-            $case: "intValue",
-            intValue: input.projectInfoTypeId!,
-          },
-        })
+      query
         .build()
     );
 

src/domain/Review.ts

@@ -94,7 +94,6 @@ class LegacyReviewDomain {
             intValue: uploadId,
           },
         })
-        .limit(1)
         .build()
     );
     if (!rows || rows?.length === 0) return undefined;