PM-1143 - update tax form enum

Author: vas3a

src/api/webhooks/trolley/handlers/tax-form.handler.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { WebhookEvent } from '../../webhooks.decorators';
 import {
-  TaxFormStatus,
+  TrolleyTaxFormStatus,
   TaxFormStatusUpdatedEvent,
   TaxFormStatusUpdatedEventData,
   TrolleyWebhookEvent,
@@ -25,7 +25,7 @@ export class TaxFormHandler {
     taxFormData: TaxFormStatusUpdatedEventData,
   ) {
     const taxFormStatus =
-      taxFormData.status === TaxFormStatus.Reviewed
+      taxFormData.status === TrolleyTaxFormStatus.Reviewed
         ? tax_form_status.ACTIVE
         : tax_form_status.INACTIVE;
 
@@ -38,6 +38,18 @@ export class TaxFormHandler {
         },
       });
 
+    // voided forms associations are removed from DB
+    if (
+      taxFormData.status === TrolleyTaxFormStatus.Voided &&
+      existingFormAssociation
+    ) {
+      return this.prisma.user_tax_form_associations.delete({
+        where: {
+          id: existingFormAssociation.id,
+        },
+      });
+    }
+
     if (!existingFormAssociation) {
       return this.prisma.user_tax_form_associations.create({
         data: {
@@ -49,15 +61,6 @@ export class TaxFormHandler {
       });
     }
 
-    // voided forms associations are removed from DB
-    if (taxFormData.status === TaxFormStatus.Voided) {
-      return this.prisma.user_tax_form_associations.delete({
-        where: {
-          id: existingFormAssociation.id,
-        },
-      });
-    }
-
     return this.prisma.user_tax_form_associations.update({
       where: { id: existingFormAssociation?.id },
       data: {

src/api/webhooks/trolley/trolley.types.ts

@@ -6,7 +6,7 @@ export enum TrolleyWebhookEvent {
 
 export type TrolleyEventHandler = (eventPayload: any) => Promise<unknown>;
 
-export enum TaxFormStatus {
+export enum TrolleyTaxFormStatus {
   Incomplete = 'incomplete',
   Submitted = 'submitted',
   Reviewed = 'reviewed',
@@ -16,7 +16,7 @@ export enum TaxFormStatus {
 export interface TaxFormStatusUpdatedEventData {
   recipientId: string;
   taxFormId: string;
-  status: TaxFormStatus;
+  status: TrolleyTaxFormStatus;
   taxFormType: string;
   taxFormAddressCountry: string;
   mailingAddressCountry: string | null;
@@ -34,7 +34,7 @@ export interface TaxFormStatusUpdatedEventData {
 export interface TaxFormStatusUpdatedEvent {
   taxForm: {
     previousFields: {
-      status: TaxFormStatus;
+      status: TrolleyTaxFormStatus;
     };
     data: TaxFormStatusUpdatedEventData;
   };

src/dto/adminWinning.dto.ts

@@ -92,13 +92,6 @@ export enum WinningsCategory {
   TASK_COPILOT_PAYMENT = 'TASK_COPILOT_PAYMENT',
 }
 
-export enum TaxFormStatus {
-  Incomplete = 'incomplete',
-  Submitted = 'submitted',
-  Reviewed = 'reviewed',
-  Voided = 'voided',
-}
-
 export enum PaymentStatus {
   PAID = 'PAID',
   ON_HOLD = 'ON_HOLD',

src/dto/taxForm.dto.ts

@@ -1,9 +1,9 @@
-import { TaxFormStatus } from './adminWinning.dto';
+import { tax_form_status } from '@prisma/client';
 
 export class TaxFormQueryResult {
   id: string;
   user_id: string;
   tax_form_id: string;
   date_filed: Date;
-  tax_form_status: TaxFormStatus;
+  tax_form_status: tax_form_status;
 }