shelflife-react-hooks 1.0.16 → 1.0.17

package/src/context/StorageItemContext.tsx

@@ -14,6 +14,9 @@ import {
     deleteItemRequest,
     editItemRequest,
     fetchAboutToExpireRequest,
+    fetchAggregatedAboutToExpireRequest,
+    fetchAggregatedExpiredRequest,
+    fetchAggregatedRunningLowRequest,
     fetchExpiredRequest,
     fetchItemsRequest,
     fetchRunningLowRequest
@@ -32,8 +35,11 @@ type StorageItemContextValue = {
     editItem: (storageId: number, itemId: number, dto: EditItemRequest) => Promise<StorageItem>;
     deleteItem: (storageId: number, itemId: number) => Promise<void>;
     fetchExpired: (storageId: number) => Promise<StorageItem[]>;
+    fetchExpiredAggregated: () => Promise<StorageItem[]>;
     fetchAboutToExpire: (storageId: number) => Promise<StorageItem[]>;
+    fetchAboutToExpireAggregated: () => Promise<StorageItem[]>;
     fetchRunningLow: (storageId: number) => Promise<RunningLowNotification[]>;
+    fetchRunningLowAggregated: () => Promise<RunningLowNotification[]>;
 };
 
 type StorageItemProviderProps = {
@@ -82,14 +88,26 @@ export const StorageItemProvider = ({ baseUrl, children }: StorageItemProviderPr
         (storageId: number) => fetchExpiredRequest(apiConfig, storageId),
         [apiConfig]
     );
+    const fetchExpiredAggregated = useCallback(
+        () => fetchAggregatedExpiredRequest(apiConfig),
+        [apiConfig]
+    );
     const fetchAboutToExpire = useCallback(
         (storageId: number) => fetchAboutToExpireRequest(apiConfig, storageId),
         [apiConfig]
     );
+    const fetchAboutToExpireAggregated = useCallback(
+        () => fetchAggregatedAboutToExpireRequest(apiConfig),
+        [apiConfig]
+    );
     const fetchRunningLow = useCallback(
         (storageId: number) => fetchRunningLowRequest(apiConfig, storageId),
         [apiConfig]
     );
+    const fetchRunningLowAggregated = useCallback(
+        () => fetchAggregatedRunningLowRequest(apiConfig),
+        [apiConfig]
+    );
 
     const value = useMemo<StorageItemContextValue>(() => ({
         items,
@@ -104,8 +122,11 @@ export const StorageItemProvider = ({ baseUrl, children }: StorageItemProviderPr
         editItem,
         deleteItem,
         fetchExpired,
+        fetchExpiredAggregated,
         fetchAboutToExpire,
-        fetchRunningLow
+        fetchAboutToExpireAggregated,
+        fetchRunningLow,
+        fetchRunningLowAggregated
     }), [
         aboutToExpireItems,
         addItem,

package/src/context/api/storageItemApi.ts

@@ -175,6 +175,48 @@ export const fetchAboutToExpireRequest = async (
     return [];
 });
 
+export const fetchAggregatedExpiredRequest = async (
+    config: StorageItemApiConfig
+): Promise<StorageItem[]> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/expired`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch expired items');
+    }
+
+    const payload = await readJson<StorageItem[]>(response);
+    if (payload) {
+        config.setExpiredItems(payload);
+        return payload;
+    }
+
+    return [];
+});
+
+export const fetchAggregatedAboutToExpireRequest = async (
+    config: StorageItemApiConfig
+): Promise<StorageItem[]> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/abouttoexpire`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch items about to expire');
+    }
+
+    const payload = await readJson<StorageItem[]>(response);
+    if (payload) {
+        config.setAboutToExpireItems(payload);
+        return payload;
+    }
+
+    return [];
+});
+
 export const fetchRunningLowRequest = async (
     config: StorageItemApiConfig,
     storageId: number
@@ -196,3 +238,24 @@ export const fetchRunningLowRequest = async (
 
     return [];
 });
+
+export const fetchAggregatedRunningLowRequest = async (
+    config: StorageItemApiConfig
+): Promise<RunningLowNotification[]> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/runninglow`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch running low items');
+    }
+
+    const payload = await readJson<RunningLowNotification[]>(response);
+    if (payload) {
+        config.setRunningLow(payload);
+        return payload;
+    }
+
+    return [];
+});

package/src/context/api/toPurchaseApi.ts

@@ -12,7 +12,7 @@ export const fetchAggregatedShoppingRequest = async (
     config: ToPurchaseApiConfig
 ): Promise<ToPurchaseItem[]> => runWithRequestState(config, async () => {
     const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/tobuy/shopping`, {
+    const response = await fetch(`${normalizedBaseUrl}/api/shoppinglist`, {
         headers: buildAuthHeaders(config.token)
     });