ingeniuscliq-core 0.5.21 → 0.5.24

package/dist/modules/CoreProduct/classes/CoreProductBuilder.js

@@ -1,8 +1,9 @@
 import { create } from 'zustand';
 import { persist } from '../../../node_modules/zustand/esm/middleware.js';
 import { CoreProductBaseService } from '../services/base.js';
+import { CoreBaseBuilder } from '../../../classes/CoreBaseBuilder.js';
 
-class CoreProductBuilder {
+class CoreProductBuilder extends CoreBaseBuilder {
   productService;
   initialState = {
     productDetails: null,
@@ -13,132 +14,137 @@ class CoreProductBuilder {
     error: null
   };
   constructor(service = new CoreProductBaseService(), initialState) {
+    super();
     this.productService = service;
     if (initialState) {
       this.initialState = { ...this.initialState, ...initialState };
     }
   }
+  getBaseState(set, get) {
+    return {
+      ...this.initialState,
+      // Setters
+      setProductDetails: (productDetails) => set({ productDetails }),
+      setCategories: (categories) => set({ categories }),
+      setProducts: (products) => set({ products }),
+      setLoading: (loading) => set({ loading }),
+      setError: (error) => set({ error }),
+      // Getters
+      getProducts: () => get().products,
+      getProductDetails: () => get().productDetails,
+      getCategories: () => get().categories,
+      // Actions
+      fetchProducts: async (params, actions) => {
+        const { onSuccess = () => {
+        }, onError = () => {
+        }, onFinish = () => {
+        } } = actions || {};
+        const { onlyFetch, ...queryParams } = params || {};
+        try {
+          if (!onlyFetch) {
+            set({ loading: true, error: null });
+          }
+          const response = await this.productService.getAllProducts(queryParams);
+          if (!onlyFetch) {
+            set({ products: response.data.data, loading: false });
+          }
+          onSuccess(response);
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set((state) => ({ ...state, error, loading: false }));
+          }
+          onError(error);
+          throw error;
+        } finally {
+          onFinish();
+        }
+      },
+      fetchProductDetails: async (id) => {
+        const currentProduct = get().productDetails;
+        if (currentProduct && String(currentProduct.id) === String(id)) {
+          return {
+            data: currentProduct,
+            message: ""
+          };
+        }
+        set({ productDetails: null, loading: true, error: null });
+        try {
+          const response = await this.productService.getProductById(id);
+          set({ productDetails: response.data.data, loading: false });
+          return response.data;
+        } catch (error) {
+          set((state) => ({ ...state, error, loading: false }));
+          throw error;
+        }
+      },
+      fetchCategories: async (params, actions) => {
+        const { onSuccess = () => {
+        }, onError = () => {
+        }, onFinish = () => {
+        } } = actions || {};
+        const { onlyFetch, ...queryParams } = params || {};
+        try {
+          if (!onlyFetch) {
+            set({ loading: true, error: null });
+          }
+          const response = await this.productService.getAllCategories(queryParams);
+          if (!onlyFetch) {
+            set({ categories: response.data.data, loading: false });
+          }
+          onSuccess(response);
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set((state) => ({ ...state, error, loading: false }));
+          }
+          onError(error);
+          throw error;
+        } finally {
+          onFinish();
+        }
+      },
+      fetchBestSellers: async (params, actions) => {
+        const { onSuccess = () => {
+        }, onError = () => {
+        }, onFinish = () => {
+        } } = actions || {};
+        const { onlyFetch, ...queryParams } = params || {};
+        try {
+          if (!onlyFetch) {
+            set({ loading: true, error: null });
+          }
+          const response = await this.productService.fetchBestSellers(queryParams);
+          if (!onlyFetch) {
+            set({ loading: false, bestSellers: response.data.data });
+          }
+          onSuccess(response);
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set((state) => ({ ...state, error, loading: false, bestSellers: null }));
+          }
+          onError(error);
+          throw error;
+        } finally {
+          onFinish();
+        }
+      },
+      reset: () => set({ ...this.initialState, ...this.extendInitialState() })
+    };
+  }
   build() {
     return create()(
       persist(
-        (set, get) => ({
-          ...this.initialState,
-          // Setters
-          setProductDetails: (productDetails) => set({ productDetails }),
-          setCategories: (categories) => set({ categories }),
-          setProducts: (products) => set({ products }),
-          setLoading: (loading) => set({ loading }),
-          setError: (error) => set({ error }),
-          // Getters
-          getProducts: () => get().products,
-          getProductDetails: () => get().productDetails,
-          getCategories: () => get().categories,
-          // Actions
-          fetchProducts: async (params, actions) => {
-            const { onSuccess = () => {
-            }, onError = () => {
-            }, onFinish = () => {
-            } } = actions || {};
-            const { onlyFetch, ...queryParams } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.productService.getAllProducts(queryParams);
-              if (!onlyFetch) {
-                set({ products: response.data.data, loading: false });
-              }
-              onSuccess(response);
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set((state) => ({ ...state, error, loading: false }));
-              }
-              onError(error);
-              throw error;
-            } finally {
-              onFinish();
-            }
-          },
-          fetchProductDetails: async (id) => {
-            const currentProduct = get().productDetails;
-            if (currentProduct && String(currentProduct.id) === String(id)) {
-              return {
-                data: currentProduct,
-                message: ""
-              };
-            }
-            set({ productDetails: null, loading: true, error: null });
-            try {
-              const response = await this.productService.getProductById(id);
-              set({ productDetails: response.data.data, loading: false });
-              return response.data;
-            } catch (error) {
-              set((state) => ({ ...state, error, loading: false }));
-              throw error;
-            }
-          },
-          fetchCategories: async (params, actions) => {
-            const { onSuccess = () => {
-            }, onError = () => {
-            }, onFinish = () => {
-            } } = actions || {};
-            const { onlyFetch, ...queryParams } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.productService.getAllCategories(queryParams);
-              if (!onlyFetch) {
-                set({ categories: response.data.data, loading: false });
-              }
-              onSuccess(response);
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set((state) => ({ ...state, error, loading: false }));
-              }
-              onError(error);
-              throw error;
-            } finally {
-              onFinish();
-            }
-          },
-          fetchBestSellers: async (params, actions) => {
-            const { onSuccess = () => {
-            }, onError = () => {
-            }, onFinish = () => {
-            } } = actions || {};
-            const { onlyFetch, ...queryParams } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.productService.fetchBestSellers(queryParams);
-              if (!onlyFetch) {
-                set({ loading: false, bestSellers: response.data.data });
-              }
-              onSuccess(response);
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set((state) => ({ ...state, error, loading: false, bestSellers: null }));
-              }
-              onError(error);
-              throw error;
-            } finally {
-              onFinish();
-            }
-          },
-          reset: () => set(this.initialState)
-        }),
+        (set, get) => this.buildStoreState(set, get),
         {
           name: "product-storage",
           partialize: (state) => ({
             productDetails: state.productDetails,
             products: state.products,
             categories: state.categories,
-            bestSellers: state.bestSellers
+            bestSellers: state.bestSellers,
+            ...this.extendPartialize(state)
           })
         }
       )

package/dist/modules/CoreShipment/classes/CoreShipmentBuilder.d.ts

@@ -1,13 +1,14 @@
-import { CoreBuilder } from '../../../classes/CoreBuilder';
+import { CoreBaseBuilder } from '../../../classes/CoreBaseBuilder';
 import { CoreShipmentBaseService } from '../services/base';
 import { CoreShippingAddress, CoreShipmentStore, CoreShippingMethod, CoreShippingMethodTypes, CoreShipmentBeneficiary } from '../types/CoreShipment';
-export declare class CoreShipmentBuilder<T extends CoreShippingMethod<Z>, K extends CoreShippingAddress, Z extends CoreShippingMethodTypes, Y extends CoreShipmentBeneficiary> implements CoreBuilder {
+export declare class CoreShipmentBuilder<T extends CoreShippingMethod<Z>, K extends CoreShippingAddress, Z extends CoreShippingMethodTypes, Y extends CoreShipmentBeneficiary, TStore extends CoreShipmentStore<T, K, Z, Y> = CoreShipmentStore<T, K, Z, Y>> extends CoreBaseBuilder<TStore> {
     protected shipmentService: CoreShipmentBaseService<T, K, Z, Y>;
-    protected initialState: Pick<CoreShipmentStore<T, K, Z, Y>, 'shippingMethods' | 'shippingAddresses' | 'beneficiaries' | 'selectedAddress' | 'loading' | 'error'>;
-    constructor(service?: CoreShipmentBaseService<T, K, Z, Y>, initialState?: any);
-    build(): import('zustand').UseBoundStore<Omit<import('zustand').StoreApi<CoreShipmentStore<T, K, Z, Y>>, "persist"> & {
+    protected initialState: Pick<TStore, 'shippingMethods' | 'shippingAddresses' | 'beneficiaries' | 'selectedAddress' | 'loading' | 'error'>;
+    constructor(service?: CoreShipmentBaseService<T, K, Z, Y>, initialState?: Partial<TStore>);
+    protected getBaseState(set: any, get: any): TStore;
+    build(): import('zustand').UseBoundStore<Omit<import('zustand').StoreApi<TStore>, "persist"> & {
         persist: {
-            setOptions: (options: Partial<import('zustand/middleware').PersistOptions<CoreShipmentStore<T, K, Z, Y>, {
+            setOptions: (options: Partial<import('zustand/middleware').PersistOptions<TStore, {
                 shippingMethods: T[];
                 shippingAddresses: import('../../..').BasePagination<K>;
                 beneficiaries: import('../../..').BasePagination<Y>;
@@ -15,9 +16,9 @@ export declare class CoreShipmentBuilder<T extends CoreShippingMethod<Z>, K exte
             clearStorage: () => void;
             rehydrate: () => Promise<void> | void;
             hasHydrated: () => boolean;
-            onHydrate: (fn: (state: CoreShipmentStore<T, K, Z, Y>) => void) => () => void;
-            onFinishHydration: (fn: (state: CoreShipmentStore<T, K, Z, Y>) => void) => () => void;
-            getOptions: () => Partial<import('zustand/middleware').PersistOptions<CoreShipmentStore<T, K, Z, Y>, {
+            onHydrate: (fn: (state: TStore) => void) => () => void;
+            onFinishHydration: (fn: (state: TStore) => void) => () => void;
+            getOptions: () => Partial<import('zustand/middleware').PersistOptions<TStore, {
                 shippingMethods: T[];
                 shippingAddresses: import('../../..').BasePagination<K>;
                 beneficiaries: import('../../..').BasePagination<Y>;

package/dist/modules/CoreShipment/classes/CoreShipmentBuilder.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"CoreShipmentBuilder.d.ts","sourceRoot":"","sources":["../../../../src/modules/CoreShipment/classes/CoreShipmentBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EAGxB,MAAM,uBAAuB,CAAC;AAG/B,qBAAa,mBAAmB,CAC9B,CAAC,SAAS,kBAAkB,CAAC,CAAC,CAAC,EAC/B,CAAC,SAAS,mBAAmB,EAC7B,CAAC,SAAS,uBAAuB,EACjC,CAAC,SAAS,uBAAuB,CACjC,YAAW,WAAW;IACtB,SAAS,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,eAAe,GAAG,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC;gBAG/J,OAAO,CAAC,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,YAAY,CAAC,EAAE,GAAG;IAab,KAAK;;;;;;;;;;;;;;;;;;;CA2Nb"}
+{"version":3,"file":"CoreShipmentBuilder.d.ts","sourceRoot":"","sources":["../../../../src/modules/CoreShipment/classes/CoreShipmentBuilder.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,eAAe,EAAE,MAAM,kCAAkC,CAAC;AACnE,OAAO,EAAE,uBAAuB,EAAE,MAAM,kBAAkB,CAAC;AAC3D,OAAO,EACL,mBAAmB,EACnB,iBAAiB,EACjB,kBAAkB,EAClB,uBAAuB,EACvB,uBAAuB,EAGxB,MAAM,uBAAuB,CAAC;AAG/B,qBAAa,mBAAmB,CAC9B,CAAC,SAAS,kBAAkB,CAAC,CAAC,CAAC,EAC/B,CAAC,SAAS,mBAAmB,EAC7B,CAAC,SAAS,uBAAuB,EACjC,CAAC,SAAS,uBAAuB,EACjC,MAAM,SAAS,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,iBAAiB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAC5E,SAAQ,eAAe,CAAC,MAAM,CAAC;IAC/B,SAAS,CAAC,eAAe,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC/D,SAAS,CAAC,YAAY,EAAE,IAAI,CAAC,MAAM,EAAE,iBAAiB,GAAG,mBAAmB,GAAG,eAAe,GAAG,iBAAiB,GAAG,SAAS,GAAG,OAAO,CAAC,CAAC;gBAGxI,OAAO,CAAC,EAAE,uBAAuB,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC7C,YAAY,CAAC,EAAE,OAAO,CAAC,MAAM,CAAC;IAiBhC,SAAS,CAAC,YAAY,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,GAAG,MAAM;IAgN3C,KAAK;;;;;;;;;;;;;;;;;;;CAgBb"}

package/dist/modules/CoreShipment/classes/CoreShipmentBuilder.js

@@ -1,13 +1,15 @@
 import { create } from 'zustand';
 import { persist } from '../../../node_modules/zustand/esm/middleware.js';
+import { CoreBaseBuilder } from '../../../classes/CoreBaseBuilder.js';
 import { CoreShipmentBaseService } from '../services/base.js';
 
-class CoreShipmentBuilder {
+class CoreShipmentBuilder extends CoreBaseBuilder {
   shipmentService;
   initialState;
   constructor(service, initialState) {
+    super();
     this.shipmentService = service || new CoreShipmentBaseService();
-    this.initialState = initialState || {
+    this.initialState = {
       shippingMethods: null,
       shippingAddresses: null,
       beneficiaries: null,
@@ -15,178 +17,185 @@ class CoreShipmentBuilder {
       loading: false,
       error: null
     };
+    if (initialState) {
+      this.initialState = { ...this.initialState, ...initialState };
+    }
   }
-  build() {
-    return create()(
-      persist(
-        (set, get) => ({
-          ...this.initialState,
-          // Shipping Methods
-          setShippingMethods: (shippingMethods) => set({ shippingMethods }),
-          getShippingMethods: () => get().shippingMethods,
-          fetchShippingMethods: async (params) => {
-            const { onlyFetch } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.shipmentService.getShippingMethods();
-              if (!onlyFetch) {
-                set({ shippingMethods: response.data.data, loading: false });
-              }
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set({ error: error || "Failed to fetch shipping methods", loading: false });
-              }
-              throw error;
-            }
-          },
-          // Shipping Addresses
-          setShippingAddresses: (shippingAddresses) => set({ shippingAddresses }),
-          getShippingAddresses: () => get().shippingAddresses,
-          // Selected Address
-          setSelectedAddress: (address) => set({ selectedAddress: address }),
-          getSelectedAddress: () => get().selectedAddress,
-          fetchShippingAddresses: async (params, actions) => {
-            const { onlyFetch, ...queryParams } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.shipmentService.getShippingAddresses(queryParams);
-              if (!onlyFetch) {
-                set({ shippingAddresses: response.data.data, loading: false });
-              }
-              actions?.onSuccess?.(response.data);
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set({ error: error || "Failed to fetch shipping addresses", loading: false });
-              }
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          addShippingAddress: async (newAddress, params, actions) => {
-            set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.addShippingAddress(newAddress);
-              await get().fetchShippingAddresses(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error.message || "Failed to add shipping address", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          updateShippingAddress: async (addressId, updateAddress, params, actions) => {
-            set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.updateShippingAddress(addressId, updateAddress);
-              await get().fetchShippingAddresses(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error || "Failed to update shipping address", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          deleteShippingAddress: async (addressId, params, actions) => {
+  getBaseState(set, get) {
+    return {
+      ...this.initialState,
+      // Shipping Methods
+      setShippingMethods: (shippingMethods) => set({ shippingMethods }),
+      getShippingMethods: () => get().shippingMethods,
+      fetchShippingMethods: async (params) => {
+        const { onlyFetch } = params || {};
+        try {
+          if (!onlyFetch) {
             set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.deleteShippingAddress(addressId);
-              await get().fetchShippingAddresses(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error || "Failed to delete shipping address", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          // Beneficiaries
-          fetchBeneficiaries: async (params, actions) => {
-            const { onlyFetch, ...queryParams } = params || {};
-            try {
-              if (!onlyFetch) {
-                set({ loading: true, error: null });
-              }
-              const response = await this.shipmentService.getBeneficiaries(queryParams);
-              if (!onlyFetch) {
-                set({ beneficiaries: response.data.data, loading: false });
-              }
-              actions?.onSuccess?.(response.data);
-              return response.data;
-            } catch (error) {
-              if (!onlyFetch) {
-                set({ error: error || "Failed to fetch beneficiaries", loading: false });
-              }
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          addBeneficiary: async (newBeneficiary, params, actions) => {
-            set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.addBeneficiary(newBeneficiary);
-              await get().fetchBeneficiaries(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error || "Failed to add beneficiary", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          updateBeneficiary: async (beneficiaryId, updateBeneficiary, params, actions) => {
+          }
+          const response = await this.shipmentService.getShippingMethods();
+          if (!onlyFetch) {
+            set({ shippingMethods: response.data.data, loading: false });
+          }
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set({ error: error || "Failed to fetch shipping methods", loading: false });
+          }
+          throw error;
+        }
+      },
+      // Shipping Addresses
+      setShippingAddresses: (shippingAddresses) => set({ shippingAddresses }),
+      getShippingAddresses: () => get().shippingAddresses,
+      // Selected Address
+      setSelectedAddress: (address) => set({ selectedAddress: address }),
+      getSelectedAddress: () => get().selectedAddress,
+      fetchShippingAddresses: async (params, actions) => {
+        const { onlyFetch, ...queryParams } = params || {};
+        try {
+          if (!onlyFetch) {
             set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.updateBeneficiary(beneficiaryId, updateBeneficiary);
-              await get().fetchBeneficiaries(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error || "Failed to update beneficiary", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          deleteBeneficiary: async (beneficiaryId, params, actions) => {
+          }
+          const response = await this.shipmentService.getShippingAddresses(queryParams);
+          if (!onlyFetch) {
+            set({ shippingAddresses: response.data.data, loading: false });
+          }
+          actions?.onSuccess?.(response.data);
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set({ error: error || "Failed to fetch shipping addresses", loading: false });
+          }
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      addShippingAddress: async (newAddress, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.addShippingAddress(newAddress);
+          await get().fetchShippingAddresses(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error.message || "Failed to add shipping address", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      updateShippingAddress: async (addressId, updateAddress, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.updateShippingAddress(addressId, updateAddress);
+          await get().fetchShippingAddresses(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error || "Failed to update shipping address", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      deleteShippingAddress: async (addressId, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.deleteShippingAddress(addressId);
+          await get().fetchShippingAddresses(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error || "Failed to delete shipping address", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      // Beneficiaries
+      fetchBeneficiaries: async (params, actions) => {
+        const { onlyFetch, ...queryParams } = params || {};
+        try {
+          if (!onlyFetch) {
             set({ loading: true, error: null });
-            try {
-              const response = await this.shipmentService.deleteBeneficiary(beneficiaryId);
-              await get().fetchBeneficiaries(params);
-              actions?.onSuccess?.(response);
-            } catch (error) {
-              set({ error: error || "Failed to delete beneficiary", loading: false });
-              actions?.onError?.(error);
-              throw error;
-            } finally {
-              actions?.onFinish?.();
-            }
-          },
-          setLoading: (loading) => set({ loading }),
-          setError: (error) => set({ error }),
-          reset: () => set(this.initialState)
-        }),
+          }
+          const response = await this.shipmentService.getBeneficiaries(queryParams);
+          if (!onlyFetch) {
+            set({ beneficiaries: response.data.data, loading: false });
+          }
+          actions?.onSuccess?.(response.data);
+          return response.data;
+        } catch (error) {
+          if (!onlyFetch) {
+            set({ error: error || "Failed to fetch beneficiaries", loading: false });
+          }
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      addBeneficiary: async (newBeneficiary, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.addBeneficiary(newBeneficiary);
+          await get().fetchBeneficiaries(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error || "Failed to add beneficiary", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      updateBeneficiary: async (beneficiaryId, updateBeneficiary, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.updateBeneficiary(beneficiaryId, updateBeneficiary);
+          await get().fetchBeneficiaries(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error || "Failed to update beneficiary", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      deleteBeneficiary: async (beneficiaryId, params, actions) => {
+        set({ loading: true, error: null });
+        try {
+          const response = await this.shipmentService.deleteBeneficiary(beneficiaryId);
+          await get().fetchBeneficiaries(params);
+          actions?.onSuccess?.(response);
+        } catch (error) {
+          set({ error: error || "Failed to delete beneficiary", loading: false });
+          actions?.onError?.(error);
+          throw error;
+        } finally {
+          actions?.onFinish?.();
+        }
+      },
+      setLoading: (loading) => set({ loading }),
+      setError: (error) => set({ error }),
+      reset: () => set({ ...this.initialState, ...this.extendInitialState() })
+    };
+  }
+  build() {
+    return create()(
+      persist(
+        (set, get) => this.buildStoreState(set, get),
         {
           name: "shipment-storage",
           partialize: (state) => ({
             shippingMethods: state.shippingMethods,
             shippingAddresses: state.shippingAddresses,
-            beneficiaries: state.beneficiaries
+            beneficiaries: state.beneficiaries,
+            ...this.extendPartialize(state)
           })
         }
       )