Registration data refactor, create ProgramFspConfigurations endpoints

services/121-service/src/migrate-visa/migrate-visa.service.ts

@@ -19,7 +19,7 @@ import {
 } from '@121-service/src/payments/fsp-integration/intersolve-visa/entities/intersolve-visa-wallet.entity';
 import { IntersolveBlockTokenReasonCodeEnum } from '@121-service/src/payments/fsp-integration/intersolve-visa/enums/intersolve-block-token-reason-code.enum';
 import { IntersolveVisaTokenStatus } from '@121-service/src/payments/fsp-integration/intersolve-visa/enums/intersolve-visa-token-status.enum';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 import { CustomHttpService } from '@121-service/src/shared/services/custom-http.service';
 import { FileImportService } from '@121-service/src/utils/file-import/file-import.service';
 

services/121-service/src/payments/fsp-integration/commercial-bank-ethiopia/commercial-bank-ethiopia.module.ts

@@ -1,4 +1,4 @@
 import { HttpModule } from '@nestjs/axios';
 import { BullModule } from '@nestjs/bull';
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
@@ -12,7 +12,6 @@
 import { RedisModule } from '@121-service/src/payments/redis/redis.module';
 import { TransactionEntity } from '@121-service/src/payments/transactions/transaction.entity';
 import { TransactionsModule } from '@121-service/src/payments/transactions/transactions.module';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
 import { ProgramFinancialServiceProviderConfigurationRepository } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configurations.repository';
 import { ProgramEntity } from '@121-service/src/programs/program.entity';
 import { RegistrationEntity } from '@121-service/src/registration/registration.entity';
@@ -21,6 +20,7 @@
 import { UserModule } from '@121-service/src/user/user.module';
 import { createScopedRepositoryProvider } from '@121-service/src/utils/scope/createScopedRepositoryProvider.helper';
 import { SoapService } from '@121-service/src/utils/soap/soap.service';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 
 @Module({
   imports: [

services/121-service/src/payments/fsp-integration/intersolve-voucher/intersolve-voucher.module.ts

@@ -18,7 +18,7 @@ import { ImageCodeModule } from '@121-service/src/payments/imagecode/image-code.
 import { RedisModule } from '@121-service/src/payments/redis/redis.module';
 import { TransactionEntity } from '@121-service/src/payments/transactions/transaction.entity';
 import { TransactionsModule } from '@121-service/src/payments/transactions/transactions.module';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 import { ProgramFinancialServiceProviderConfigurationRepository } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configurations.repository';
 import { ProgramEntity } from '@121-service/src/programs/program.entity';
 import { ProgramAidworkerAssignmentEntity } from '@121-service/src/programs/program-aidworker.entity';

services/121-service/src/payments/payments.service.ts

@@ -36,7 +36,7 @@ import { TransactionStatusEnum } from '@121-service/src/payments/transactions/en
 import { TransactionEntity } from '@121-service/src/payments/transactions/transaction.entity';
 import { TransactionScopedRepository } from '@121-service/src/payments/transactions/transaction.repository';
 import { TransactionsService } from '@121-service/src/payments/transactions/transactions.service';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 import { ProgramFinancialServiceProviderConfigurationRepository } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configurations.repository';
 import { ProgramEntity } from '@121-service/src/programs/program.entity';
 import {

services/121-service/src/payments/transactions/transaction.entity.ts

@@ -1,4 +1,4 @@
 import {
   Column,
   Entity,
   Index,
@@ -10,10 +10,10 @@
 
 import { Base121AuditedEntity } from '@121-service/src/base-audited.entity';
 import { LatestTransactionEntity } from '@121-service/src/payments/transactions/latest-transaction.entity';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
 import { ProgramEntity } from '@121-service/src/programs/program.entity';
 import { RegistrationEntity } from '@121-service/src/registration/registration.entity';
 import { UserEntity } from '@121-service/src/user/user.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 
 @Entity('transaction')
 export class TransactionEntity extends Base121AuditedEntity {

services/121-service/src/program-financial-service-provider-configurations/dtos/create-program-financial-service-provider-configuration.dto.ts

@@ -0,0 +1,32 @@
+import {
+  FinancialServiceProviderConfigurationEnum,
+  FinancialServiceProviderName,
+} from '@121-service/src/financial-service-providers/enum/financial-service-provider-name.enum';
+import { LocalizedString } from '@121-service/src/shared/types/localized-string.type';
+import { ApiProperty } from '@nestjs/swagger';
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class CreateProgramFinancialServiceProviderConfigurationDto {
+  // TODO: Do we accept spaces in the name? Any other naming criteria? Special characters? All lowercase?
+  @ApiProperty({ example: 'VisaDebitCards' })
+  @IsNotEmpty()
+  @IsString()
+  public readonly name: string;
+
+  @ApiProperty({
+    example: {
+      en: 'Visa Debit Cards',
+      nl: 'Visa-betaalkaarten',
+    },
+  })
+  @IsNotEmpty()
+  public readonly label: LocalizedString;
+
+  @ApiProperty({
+    enum: FinancialServiceProviderName,
+    type: 'enum',
+    example: FinancialServiceProviderName.intersolveVoucherWhatsapp,
+  })
+  @IsNotEmpty()
+  public readonly financialServiceProviderName: FinancialServiceProviderName;
+}

services/121-service/src/program-financial-service-provider-configurations/dtos/program-financial-service-provider-configuration-response.dto.ts

@@ -6,17 +6,17 @@ import { LocalizedString } from '@121-service/src/shared/types/localized-string.
 
 export class ProgramFinancialServiceProviderConfigurationResponseDto {
   @ApiProperty({ example: 1, type: 'number' })
-  public programId: number;
+  public readonly programId: number;
 
   @ApiProperty({ enum: FinancialServiceProviders, type: 'enum' })
   public financialServiceProviderName: FinancialServiceProviders;
 
   @ApiProperty({ example: 'FSP Name', type: 'string' })
-  public name: string;
+  public readonly name: string;
 
   @ApiProperty({ type: 'object' })
-  public label: LocalizedString;
+  public readonly label: LocalizedString;
 
   @ApiProperty({ type: 'object' })
-  public financialServiceProvider: FinancialServiceProviderDto;
+  public readonly financialServiceProvider: FinancialServiceProviderDto;
 }

services/121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration-property.entity.ts → services/121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration-property.entity.ts

@@ -1,3 +1,5 @@
+import { CascadeDeleteEntity } from '@121-service/src/base.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity';
 import { isObject } from 'lodash';
 import {
   Column,
@@ -8,9 +10,6 @@
   Unique,
 } from 'typeorm';
 
-import { CascadeDeleteEntity } from '@121-service/src/base.entity';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
-
 @Unique('programFinancialServiceProviderConfigurationPropertyUnique', [
   'programFinancialServiceProviderConfigurationId',
   'name',

services/121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity.ts → services/121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration.entity.ts

@@ -1,3 +1,8 @@
+import { CascadeDeleteEntity } from '@121-service/src/base.entity';
+import { TransactionEntity } from '@121-service/src/payments/transactions/transaction.entity';
+import { ProgramFinancialServiceProviderConfigurationPropertyEntity } from '@121-service/src/program-financial-service-provider-configurations/entities/program-financial-service-provider-configuration-property.entity';
+import { ProgramEntity } from '@121-service/src/programs/program.entity';
+import { LocalizedString } from '@121-service/src/shared/types/localized-string.type';
 import {
   Column,
   Entity,
@@ -8,13 +13,7 @@
   Unique,
 } from 'typeorm';
 
-import { CascadeDeleteEntity } from '@121-service/src/base.entity';
-import { ProgramEntity } from '@121-service/src/programs/program.entity';
 import { FinancialServiceProviders } from '@121-service/src/financial-service-providers/enum/financial-service-provider-name.enum';
-import { TransactionEntity } from '@121-service/src/payments/transactions/transaction.entity';
-import { ProgramFinancialServiceProviderConfigurationPropertyEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration-property.entity';
-
-import { LocalizedString } from '@121-service/src/shared/types/localized-string.type';
 
 @Unique('programFinancialServiceProviderConfigurationUnique', [
   'programId',

services/121-service/src/program-financial-service-provider-configurations/mappers/program-financial-service-provider-configuration.mapper.ts

@@ -1,6 +1,6 @@
 import { FINANCIAL_SERVICE_PROVIDERS } from '@121-service/src/financial-service-providers/financial-service-providers.const';
 import { ProgramFinancialServiceProviderConfigurationResponseDto } from '@121-service/src/program-financial-service-provider-configurations/dtos/program-financial-service-provider-configuration-response.dto';
-import { ProgramFinancialServiceProviderConfigurationEntity } from '@121-service/src/program-financial-service-provider-configurations/program-financial-service-provider-configuration.entity';
+import { ProgramFinancialServiceProviderConfigurationEntity } from '../entities/program-financial-service-provider-configuration.entity';
 
 export class ProgramFinancialServiceProviderConfigurationMapper {
   public static mapEntitiesToDtos(
@@ -14,12 +14,6 @@
   public static mapEntitytoDto(
     entity: ProgramFinancialServiceProviderConfigurationEntity,
   ): ProgramFinancialServiceProviderConfigurationResponseDto {
-    const dto = new ProgramFinancialServiceProviderConfigurationResponseDto();
-
-    dto.programId = entity.programId;
-    dto.financialServiceProviderName = entity.financialServiceProviderName;
-    dto.name = entity.name;
-    dto.label = entity.label;
     const financialServiceProvider = FINANCIAL_SERVICE_PROVIDERS.find(
       (fsp) => fsp.name === entity.financialServiceProviderName,
     );
@@ -28,7 +22,14 @@
         'Financial service provider assigned to program not found in the list of available financial service providers',
       );
     }
-    dto.financialServiceProvider = financialServiceProvider;
+
+    const dto: ProgramFinancialServiceProviderConfigurationResponseDto = {
+      programId: entity.programId,
+      financialServiceProviderName: entity.financialServiceProviderName,
+      name: entity.name,
+      label: entity.label,
+      financialServiceProvider: financialServiceProvider,
+    };
     return dto;
   }
 }