feat(fulfilment): submit fulfilment

restorecommerce · Oct 25, 2024 · 30318e2 · 30318e2
1 parent b34640a
commit 30318e2
Show file tree

Hide file tree

Showing 7 changed files with 114 additions and 20 deletions.
diff --git a/packages/core/graphql/src/lib/documents/fragments/fulfillment.gql b/packages/core/graphql/src/lib/documents/fragments/fulfillment.gql
@@ -3,6 +3,18 @@ fragment FulfillmentFragment on IoRestorecommerceFulfillmentFulfillment {
   customerId
   shopId
   userId
+  labels {
+    pdf
+    png
+    shipmentNumber
+    state
+    parcelId
+    url
+    status {
+      code
+      message
+    }
+  }
   packaging {
     exportType
     notify

diff --git a/packages/core/graphql/src/lib/generated/generated.ts b/packages/core/graphql/src/lib/generated/generated.ts
@@ -5993,6 +5993,20 @@ export type FulfillmentFragmentFragment = {
   shopId?: string | null;
   userId?: string | null;
   fulfillmentState?: IoRestorecommerceFulfillmentFulfillmentState | null;
+  labels?: Array<{
+    __typename?: 'IoRestorecommerceFulfillmentLabel';
+    pdf?: string | null;
+    png?: string | null;
+    shipmentNumber?: string | null;
+    state?: IoRestorecommerceFulfillmentFulfillmentState | null;
+    parcelId?: string | null;
+    url?: string | null;
+    status?: {
+      __typename?: 'IoRestorecommerceStatusStatus';
+      code?: number | null;
+      message?: string | null;
+    } | null;
+  }> | null;
   packaging?: {
     __typename?: 'IoRestorecommerceFulfillmentPackaging';
     exportType?: string | null;
@@ -7319,6 +7333,20 @@ export type FulfillmentFulfillmentMutateMutation = {
               shopId?: string | null;
               userId?: string | null;
               fulfillmentState?: IoRestorecommerceFulfillmentFulfillmentState | null;
+              labels?: Array<{
+                __typename?: 'IoRestorecommerceFulfillmentLabel';
+                pdf?: string | null;
+                png?: string | null;
+                shipmentNumber?: string | null;
+                state?: IoRestorecommerceFulfillmentFulfillmentState | null;
+                parcelId?: string | null;
+                url?: string | null;
+                status?: {
+                  __typename?: 'IoRestorecommerceStatusStatus';
+                  code?: number | null;
+                  message?: string | null;
+                } | null;
+              }> | null;
               packaging?: {
                 __typename?: 'IoRestorecommerceFulfillmentPackaging';
                 exportType?: string | null;
@@ -7460,6 +7488,20 @@ export type FulfillmentFulfillmentReadQuery = {
               shopId?: string | null;
               userId?: string | null;
               fulfillmentState?: IoRestorecommerceFulfillmentFulfillmentState | null;
+              labels?: Array<{
+                __typename?: 'IoRestorecommerceFulfillmentLabel';
+                pdf?: string | null;
+                png?: string | null;
+                shipmentNumber?: string | null;
+                state?: IoRestorecommerceFulfillmentFulfillmentState | null;
+                parcelId?: string | null;
+                url?: string | null;
+                status?: {
+                  __typename?: 'IoRestorecommerceStatusStatus';
+                  code?: number | null;
+                  message?: string | null;
+                } | null;
+              }> | null;
               packaging?: {
                 __typename?: 'IoRestorecommerceFulfillmentPackaging';
                 exportType?: string | null;
@@ -7576,6 +7618,20 @@ export type FulfillmentFulfillmentSubmitMutation = {
               shopId?: string | null;
               userId?: string | null;
               fulfillmentState?: IoRestorecommerceFulfillmentFulfillmentState | null;
+              labels?: Array<{
+                __typename?: 'IoRestorecommerceFulfillmentLabel';
+                pdf?: string | null;
+                png?: string | null;
+                shipmentNumber?: string | null;
+                state?: IoRestorecommerceFulfillmentFulfillmentState | null;
+                parcelId?: string | null;
+                url?: string | null;
+                status?: {
+                  __typename?: 'IoRestorecommerceStatusStatus';
+                  code?: number | null;
+                  message?: string | null;
+                } | null;
+              }> | null;
               packaging?: {
                 __typename?: 'IoRestorecommerceFulfillmentPackaging';
                 exportType?: string | null;
@@ -10718,6 +10774,18 @@ export const FulfillmentFragmentFragmentDoc = gql`
     customerId
     shopId
     userId
+    labels {
+      pdf
+      png
+      shipmentNumber
+      state
+      parcelId
+      url
+      status {
+        code
+        message
+      }
+    }
     packaging {
       exportType
       notify

diff --git a/packages/core/state/src/lib/+state/fulfillment/fulfillment.actions.ts b/packages/core/state/src/lib/+state/fulfillment/fulfillment.actions.ts
@@ -43,7 +43,7 @@ export const fulfillmentCreateFail = createAction(
 
 export const fulfillmentSubmitRequest = createAction(
   '[FULFILLMENT] Submit request',
-  props<{ payload: IIoRestorecommerceResourcebaseReadRequest }>()
+  props<{ payload: { id: string } }>()
 );
 
 export const fulfillmentSubmitSuccess = createAction(

diff --git a/packages/core/state/src/lib/+state/fulfillment/fulfillment.effects.ts b/packages/core/state/src/lib/+state/fulfillment/fulfillment.effects.ts
@@ -206,25 +206,34 @@ export class FulfillmentEffects {
     return this.actions$.pipe(
       ofType(fulfillmentActions.fulfillmentSubmitRequest),
       switchMap(({ payload }) =>
-        this.fulfillmentService.submit(payload).pipe(
-          tap((result) => {
-            this.errorHandlingService.checkStatusAndThrow(
-              result?.data?.fulfillment?.fulfillment?.Submit?.details
-                ?.operationStatus as TOperationStatus
-            );
-          }),
-          map((result) => {
-            const payload =
-              result?.data?.fulfillment?.fulfillment?.Submit?.details?.items?.pop()
-                ?.payload as IFulfillment;
-            return fulfillmentActions.fulfillmentSubmitSuccess({ payload });
-          }),
-          catchError((error: Error) =>
-            of(
-              fulfillmentActions.fulfillmentSubmitFail({ error: error.message })
+        this.fulfillmentService
+          .submit({
+            items: [payload],
+          })
+          .pipe(
+            tap((result) => {
+              this.errorHandlingService.checkStatusAndThrow(
+                result?.data?.fulfillment?.fulfillment?.Submit?.details
+                  ?.operationStatus as TOperationStatus
+              );
+            }),
+            map((result) => {
+              const payload =
+                result?.data?.fulfillment?.fulfillment?.Submit?.details?.items?.pop()
+                  ?.payload as IFulfillment;
+
+              console.log('Payload:', payload);
+
+              return fulfillmentActions.fulfillmentSubmitSuccess({ payload });
+            }),
+            catchError((error: Error) =>
+              of(
+                fulfillmentActions.fulfillmentSubmitFail({
+                  error: error.message,
+                })
+              )
             )
           )
-        )
       )
     );
   });

diff --git a/packages/core/state/src/lib/+state/fulfillment/fulfillment.facade.ts b/packages/core/state/src/lib/+state/fulfillment/fulfillment.facade.ts
@@ -50,6 +50,10 @@ export class FulfillmentFacade {
     );
 
   // TODO Submit a fulfilment.
+  submit = (payload: { id: string }) =>
+    this.store.dispatch(
+      fulfillmentActions.fulfillmentSubmitRequest({ payload })
+    );
 
   constructor(private readonly store: Store) {}
 }
diff --git a/packages/modules/fulfillment/src/lib/components/template/fulfillment-template.component.ts b/packages/modules/fulfillment/src/lib/components/template/fulfillment-template.component.ts
@@ -65,7 +65,7 @@ export class FulfillmentTemplateComponent implements OnInit, OnDestroy {
           return;
         }
 
-        // TODO this.fulfillmentFacade.submitFulfilment(id);
+        this.fulfillmentFacade.submit({ id });
       })
     );
 
@@ -126,6 +126,7 @@ export class FulfillmentTemplateComponent implements OnInit, OnDestroy {
     triggerRead: this.triggerRead$,
     triggerSelectId: this.triggerSelectId$,
     triggerRemove: this.triggerRemove$,
+    triggerSubmitFulfillment: this.triggerSubmitFulfillment$,
   });
 
   private readonly subscriptions = new SubSink();

diff --git a/packages/modules/ui/src/lib/components/organisms/crud/crud-main.component.html b/packages/modules/ui/src/lib/components/organisms/crud/crud-main.component.html
@@ -128,7 +128,7 @@
                       isTriggerSubmitFulfillment &&
                       [EUrlSegment.View].includes(urlSegment)
                     "
-                    (click)="onCreateFulfillment(id)"
+                    (click)="onSubmitFulfillment(id)"
                     vcl-button
                     rc-append
                     class="square half-transparent button"