fix: filter on operator & validate referenceId

global-121 · Sep 27, 2024 · ccfa983 · ccfa983
1 parent 932bc31
commit ccfa983
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 1 deletion.
diff --git a/services/121-service/src/registration/services/registrations-pagination.service.ts b/services/121-service/src/registration/services/registrations-pagination.service.ts
@@ -163,7 +163,10 @@ export class RegistrationsPaginationService {
 
     queryBuilder = this.addPaymentFilter(queryBuilder, query);
 
-    if (query?.filter?.referenceId?.includes('$ilike') === false) {
+    // Replacing the filter on referenceId is needed in specific cases where the referenceId only consists of numbers.
+    // The includes('$') === false is needed to check if the query doesn't contain an '$ilike' operator.
+    // If the filter has a '$' we don't need to replace the filter
+    if (query?.filter?.referenceId?.includes('$') === false) {
       queryBuilder.andWhere('CAST("referenceId" AS TEXT) = :referenceId', {
         referenceId: query.filter.referenceId,
       });

diff --git a/services/121-service/src/registration/validators/registrations-input-validator.ts b/services/121-service/src/registration/validators/registrations-input-validator.ts
@@ -434,6 +434,14 @@ export class RegistrationsInputValidator {
     i: number,
     validationConfig: ValidationConfigDto,
   ): Promise<ValidateRegistrationErrorObjectDto | undefined> {
+    if (row.referenceId && row.referenceId.includes('$')) {
+      return {
+        lineNumber: i + 1,
+        column: GenericAttributes.referenceId,
+        value: row.referenceId,
+        error: 'referenceId contains a $ character',
+      };
+    }
     if (validationConfig.validateExistingReferenceId && row.referenceId) {
       const registration = await this.registrationRepository.findOne({
         where: { referenceId: Equal(row.referenceId) },