Merge pull request #182 from topcoder-platform/PM-4669_additional-support-for-payment-cycles

PM-4669 - support for payment cycles engagement payments

Author: vas3a

src/api/admin/admin.service.ts

@@ -33,7 +33,10 @@ import {
   TopcoderChallengeInfo,
   TopcoderChallengesService,
 } from 'src/shared/topcoder/challenges.service';
-import { WinningPaymentDetailsDto } from './dto/payment-details.dto';
+import {
+  PaymentCycle,
+  WinningPaymentDetailsDto,
+} from './dto/payment-details.dto';
 
 const PAYMENT_DECIMAL_PLACES = 2;
 const BUDGET_LEDGER_DECIMAL_PLACES = 4;
@@ -261,6 +264,13 @@ export class AdminService {
       assignment.standardHoursPerWeek !== null
         ? Number(assignment.standardHoursPerWeek)
         : undefined;
+    const standardHoursPerDay =
+      assignment?.standardHoursPerDay !== undefined &&
+      assignment.standardHoursPerDay !== null
+        ? Number(assignment.standardHoursPerDay)
+        : Number.isFinite(standardHoursPerWeek)
+          ? Number(((standardHoursPerWeek ?? 0) / 5).toFixed(2))
+          : undefined;
     const projectId = engagement.projectId ?? engagement.project?.id;
     const projectName =
       (engagement.projectName ?? engagement.project?.name)?.trim() ?? undefined;
@@ -288,6 +298,11 @@ export class AdminService {
         ? durationMonths
         : undefined,
       ratePerHour: assignment?.ratePerHour?.trim() ?? undefined,
+      paymentCycle: (assignment?.paymentCycle?.trim() ||
+        'WEEKLY') as PaymentCycle,
+      standardHoursPerDay: Number.isFinite(standardHoursPerDay)
+        ? standardHoursPerDay
+        : undefined,
       standardHoursPerWeek: Number.isFinite(standardHoursPerWeek)
         ? standardHoursPerWeek
         : undefined,
@@ -1316,6 +1331,14 @@ export class AdminService {
             : undefined,
           durationMonths: assignmentContext.durationMonths ?? undefined,
           ratePerHour: assignmentContext.ratePerHour ?? undefined,
+          paymentCycle: (assignmentContext.paymentCycle ??
+            'WEEKLY') as PaymentCycle,
+          standardHoursPerDay:
+            assignmentContext.standardHoursPerDay ??
+            (assignmentContext.standardHoursPerWeek !== undefined &&
+            assignmentContext.standardHoursPerWeek !== null
+              ? Number((assignmentContext.standardHoursPerWeek / 5).toFixed(2))
+              : undefined),
           standardHoursPerWeek:
             assignmentContext.standardHoursPerWeek ?? undefined,
           otherRemarks: assignmentContext.otherRemarks ?? undefined,

src/api/admin/dto/payment-details.dto.ts

@@ -1,5 +1,7 @@
 import { ApiPropertyOptional } from '@nestjs/swagger';
 
+export type PaymentCycle = 'WEEKLY' | 'FORTNIGHTLY' | 'MONTHLY';
+
 export class PaymentEngagementDetailsDto {
   @ApiPropertyOptional({
     description: 'The assignment ID associated with the payment',
@@ -49,6 +51,19 @@ export class PaymentEngagementDetailsDto {
   })
   ratePerHour?: string;
 
+  @ApiPropertyOptional({
+    description: 'Assignment payment cycle',
+    enum: ['WEEKLY', 'FORTNIGHTLY', 'MONTHLY'],
+    example: 'WEEKLY',
+  })
+  paymentCycle?: PaymentCycle;
+
+  @ApiPropertyOptional({
+    description: 'Assignment standard hours per day',
+    example: 8,
+  })
+  standardHoursPerDay?: number;
+
   @ApiPropertyOptional({
     description: 'Assignment standard hours per week',
     example: 40,

src/shared/topcoder/engagements.service.ts

@@ -17,9 +17,11 @@ export interface TopcoderAssignmentContext {
   memberHandle: string;
   memberId: string;
   otherRemarks?: string | null;
+  paymentCycle?: string | null;
   projectId: string;
   projectName?: string;
   ratePerHour?: string | null;
+  standardHoursPerDay?: number | null;
   standardHoursPerWeek?: number | null;
   startDate?: string | null;
   status: string;
@@ -34,7 +36,9 @@ export interface TopcoderEngagementAssignment {
   memberHandle?: string | null;
   memberId?: string | number | null;
   otherRemarks?: string | null;
+  paymentCycle?: string | null;
   ratePerHour?: string | null;
+  standardHoursPerDay?: number | string | null;
   startDate?: string | null;
   standardHoursPerWeek?: number | string | null;
 }