shelflife-react-hooks 1.0.18 → 1.0.20

package/src/context/api/productApi.ts

@@ -1,201 +1,223 @@
-import type { Product } from '../../type/models.js';
-import type { PaginatedResponse } from '../../type/PaginatedResponse.js';
-import type { ProductCreateError } from '../../type/product.js';
-import type { CreateProductRequest, UpdateProductRequest } from '../../type/requests.js';
-import { buildAuthHeaders, normalizeBaseUrl, readArrayBuffer, readJson } from '../http.js';
-import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
-
-type ProductApiConfig = RequestStateHandlers & {
-    baseUrl: string;
-    token: string | null;
-    setProducts: (value: Product[] | ((items: Product[]) => Product[])) => void;
-    setProduct: (value: Product | null | ((prev: Product | null) => Product | null)) => void;
-};
-
-const updateById = (items: Product[], updated: Product): Product[] => {
-    const index = items.findIndex((item) => item.id === updated.id);
-    if (index === -1) {
-        return [updated, ...items];
-    }
-
-    const next = [...items];
-    next[index] = updated;
-    return next;
-};
-
-export const fetchProductsRequest = async (
-    config: ProductApiConfig,
-    search: string,
-    size: number,
-    page: number
-): Promise<PaginatedResponse<Product>> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    let url = `${normalizedBaseUrl}/api/products?search=${search}`;
-    if (size > 0)
-        url += `&page=${page}&size=${size}`;
-
-    const response = await fetch(url, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch products');
-    }
-
-    const payload = await readJson<PaginatedResponse<Product>>(response);
-    if (payload) {
-        config.setProducts(payload.data);
-        return payload;
-    }
-
-    return { data: [], currentPage: 0, hasNext: false, hasPrevious: false, pageSize: 0, totalItems: 0, totalPages: 0 };
-});
-
-export const fetchProductRequest = async (
-    config: ProductApiConfig,
-    id: number
-): Promise<Product | null> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (response.status === 404) {
-        config.setProduct(null);
-        return null;
-    }
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch product');
-    }
-
-    const payload = await readJson<Product>(response);
-    if (!payload) {
-        throw new Error('Product response missing data');
-    }
-
-    config.setProduct(payload);
-    config.setProducts((previous) => updateById(previous, payload));
-    return payload;
-});
-
-export const createProductRequest = async (
-    config: ProductApiConfig,
-    dto: CreateProductRequest
-): Promise<Product> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/products`, {
-        method: 'POST',
-        headers: {
-            ...buildAuthHeaders(config.token),
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const err = await readJson<ProductCreateError>(response);
-
-        if (err?.name || err?.barcode || err?.category || err?.expirationDaysDelta)
-            throw err;
-
-        throw new Error('Failed to create product');
-    }
-
-    const payload = await readJson<Product>(response);
-    if (!payload) {
-        throw new Error('Create product response missing data');
-    }
-
-    config.setProducts((previous) => [payload, ...previous]);
-    config.setProduct(payload);
-    return payload;
-});
-
-export const updateProductRequest = async (
-    config: ProductApiConfig,
-    id: number,
-    dto: UpdateProductRequest
-): Promise<Product> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
-        method: 'PATCH',
-        headers: {
-            ...buildAuthHeaders(config.token),
-            'Content-Type': 'application/json'
-        },
-        body: JSON.stringify(dto)
-    });
-
-    if (!response.ok) {
-        const err = await readJson<ProductCreateError>(response);
-
-        if (err?.name || err?.barcode || err?.category || err?.expirationDaysDelta)
-            throw err;
-
-        throw new Error('Failed to update product');
-    }
-
-    const payload = await readJson<Product>(response);
-    if (!payload) {
-        throw new Error('Update product response missing data');
-    }
-
-    config.setProducts((previous) => updateById(previous, payload));
-    config.setProduct(payload);
-    return payload;
-});
-
-export const deleteProductRequest = async (
-    config: ProductApiConfig,
-    id: number
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
-        method: 'DELETE',
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to delete product');
-    }
-
-    config.setProducts((previous) => previous.filter((item) => item.id !== id));
-    config.setProduct((current) => (current?.id === id ? null : current));
-});
-
-export const getProductIconRequest = async (
-    config: ProductApiConfig,
-    id: number
-): Promise<ArrayBuffer> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}/icon`, {
-        headers: buildAuthHeaders(config.token)
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to fetch product icon');
-    }
-
-    return readArrayBuffer(response);
-});
-
-export const uploadProductIconRequest = async (
-    config: ProductApiConfig,
-    id: number,
-    file: Blob
-): Promise<void> => runWithRequestState(config, async () => {
-    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
-    const formData = new FormData();
-    formData.append('pfp', file);
-
-    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}/icon`, {
-        method: 'POST',
-        headers: buildAuthHeaders(config.token),
-        body: formData
-    });
-
-    if (!response.ok) {
-        throw new Error('Failed to upload product icon');
-    }
-});
+import type { Product } from '../../type/models.js';
+import type { PaginatedResponse } from '../../type/PaginatedResponse.js';
+import type { ProductCreateError } from '../../type/product.js';
+import type { CreateProductRequest, UpdateProductRequest } from '../../type/requests.js';
+import { buildAuthHeaders, normalizeBaseUrl, readArrayBuffer, readJson } from '../http.js';
+import { runWithRequestState, type RequestStateHandlers } from './requestState.js';
+
+type ProductApiConfig = RequestStateHandlers & {
+    baseUrl: string;
+    token: string | null;
+    setCategories: (value: string[] | ((items: string[]) => string[])) => void;
+    setProducts: (value: Product[] | ((items: Product[]) => Product[])) => void;
+    setProduct: (value: Product | null | ((prev: Product | null) => Product | null)) => void;
+};
+
+const updateById = (items: Product[], updated: Product): Product[] => {
+    const index = items.findIndex((item) => item.id === updated.id);
+    if (index === -1) {
+        return [updated, ...items];
+    }
+
+    const next = [...items];
+    next[index] = updated;
+    return next;
+};
+
+export const fetchProductsRequest = async (
+    config: ProductApiConfig,
+    search: string,
+    size: number,
+    page: number
+): Promise<PaginatedResponse<Product>> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    let url = `${normalizedBaseUrl}/api/products?search=${search}`;
+    if (size > 0)
+        url += `&page=${page}&size=${size}`;
+
+    const response = await fetch(url, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch products');
+    }
+
+    const payload = await readJson<PaginatedResponse<Product>>(response);
+    if (payload) {
+        config.setProducts(payload.data);
+        return payload;
+    }
+
+    return { data: [], currentPage: 0, hasNext: false, hasPrevious: false, pageSize: 0, totalItems: 0, totalPages: 0 };
+});
+
+export const fetchProductRequest = async (
+    config: ProductApiConfig,
+    id: number
+): Promise<Product | null> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (response.status === 404) {
+        config.setProduct(null);
+        return null;
+    }
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch product');
+    }
+
+    const payload = await readJson<Product>(response);
+    if (!payload) {
+        throw new Error('Product response missing data');
+    }
+
+    config.setProduct(payload);
+    config.setProducts((previous) => updateById(previous, payload));
+    return payload;
+});
+
+export const fetchCategoriesRequest = async (
+    config: ProductApiConfig
+): Promise<string[] | null> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products/categories`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch categories');
+    }
+
+    const payload = await readJson<string[]>(response);
+    if (!payload) {
+        throw new Error('Category response missing data');
+    }
+
+    config.setCategories(payload);
+    return payload;
+});
+
+export const createProductRequest = async (
+    config: ProductApiConfig,
+    dto: CreateProductRequest
+): Promise<Product> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products`, {
+        method: 'POST',
+        headers: {
+            ...buildAuthHeaders(config.token),
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const err = await readJson<ProductCreateError>(response);
+
+        if (err?.name || err?.barcode || err?.category || err?.expirationDaysDelta)
+            throw err;
+
+        throw new Error('Failed to create product');
+    }
+
+    const payload = await readJson<Product>(response);
+    if (!payload) {
+        throw new Error('Create product response missing data');
+    }
+
+    config.setProducts((previous) => [payload, ...previous]);
+    config.setProduct(payload);
+    return payload;
+});
+
+export const updateProductRequest = async (
+    config: ProductApiConfig,
+    id: number,
+    dto: UpdateProductRequest
+): Promise<Product> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
+        method: 'PATCH',
+        headers: {
+            ...buildAuthHeaders(config.token),
+            'Content-Type': 'application/json'
+        },
+        body: JSON.stringify(dto)
+    });
+
+    if (!response.ok) {
+        const err = await readJson<ProductCreateError>(response);
+
+        if (err?.name || err?.barcode || err?.category || err?.expirationDaysDelta)
+            throw err;
+
+        throw new Error('Failed to update product');
+    }
+
+    const payload = await readJson<Product>(response);
+    if (!payload) {
+        throw new Error('Update product response missing data');
+    }
+
+    config.setProducts((previous) => updateById(previous, payload));
+    config.setProduct(payload);
+    return payload;
+});
+
+export const deleteProductRequest = async (
+    config: ProductApiConfig,
+    id: number
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}`, {
+        method: 'DELETE',
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to delete product');
+    }
+
+    config.setProducts((previous) => previous.filter((item) => item.id !== id));
+    config.setProduct((current) => (current?.id === id ? null : current));
+});
+
+export const getProductIconRequest = async (
+    config: ProductApiConfig,
+    id: number
+): Promise<ArrayBuffer> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}/icon`, {
+        headers: buildAuthHeaders(config.token)
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to fetch product icon');
+    }
+
+    return readArrayBuffer(response);
+});
+
+export const uploadProductIconRequest = async (
+    config: ProductApiConfig,
+    id: number,
+    file: Blob
+): Promise<void> => runWithRequestState(config, async () => {
+    const normalizedBaseUrl = normalizeBaseUrl(config.baseUrl);
+    const formData = new FormData();
+    formData.append('pfp', file);
+
+    const response = await fetch(`${normalizedBaseUrl}/api/products/${id}/icon`, {
+        method: 'POST',
+        headers: buildAuthHeaders(config.token),
+        body: formData
+    });
+
+    if (!response.ok) {
+        throw new Error('Failed to upload product icon');
+    }
+});

package/src/context/api/requestState.ts

@@ -1,24 +1,24 @@
-export type RequestStateHandlers = {
-    setIsLoading: (value: boolean) => void;
-    setIsError: (value: boolean) => void;
-    setError: (error: any | null) => void;
-};
-
-export const runWithRequestState = async <T>(
-    handlers: RequestStateHandlers,
-    request: () => Promise<T>
-): Promise<T> => {
-    handlers.setIsLoading(true);
-    handlers.setIsError(false);
-    handlers.setError(null);
-
-    try {
-        return await request();
-    } catch (err) {
-        handlers.setIsError(true);
-        handlers.setError(err);
-        throw err;
-    } finally {
-        handlers.setIsLoading(false);
-    }
-};
+export type RequestStateHandlers = {
+    setIsLoading: (value: boolean) => void;
+    setIsError: (value: boolean) => void;
+    setError: (error: any | null) => void;
+};
+
+export const runWithRequestState = async <T>(
+    handlers: RequestStateHandlers,
+    request: () => Promise<T>
+): Promise<T> => {
+    handlers.setIsLoading(true);
+    handlers.setIsError(false);
+    handlers.setError(null);
+
+    try {
+        return await request();
+    } catch (err) {
+        handlers.setIsError(true);
+        handlers.setError(err);
+        throw err;
+    } finally {
+        handlers.setIsLoading(false);
+    }
+};