Merge pull request #330 from con2/CON2-223-frontend-add-category-CRUD

Con2 223 frontend add category crud

Author: stabjana

backend/src/modules/categories/categories.controller.ts

@@ -27,7 +27,7 @@ export class CategoriesController {
 
   // Create New Category
   @Post()
-  @Roles(["tenant_admin", "storage_manager"])
+  @Roles(["tenant_admin"])
   async createCategory(
     @Req() req: AuthRequest,
     @Body() newCategory: CreateCategoryDto,
@@ -38,7 +38,7 @@ export class CategoriesController {
 
   // Update a Category
   @Patch(":id")
-  @Roles(["tenant_admin", "storage_manager"])
+  @Roles(["tenant_admin"])
   async updateCategory(
     @Req() req: AuthRequest,
     @Param("id") id: string,
@@ -54,7 +54,7 @@ export class CategoriesController {
 
   // Delete a Category
   @Delete(":id")
-  @Roles(["tenant_admin", "storage_manager"])
+  @Roles(["tenant_admin"])
   async deleteCategory(@Req() req: AuthRequest, @Param("id") id: string) {
     const { supabase } = req;
     return await this.categoryService.deleteCategory({ supabase, id });

backend/src/modules/categories/categories.service.ts

@@ -6,7 +6,7 @@ import {
   GetParamsDto,
   UpdateParamsDto,
 } from "./dto/params.dto";
-import { getPaginationRange } from "@src/utils/pagination";
+import { getPaginationMeta, getPaginationRange } from "@src/utils/pagination";
 import { handleSupabaseError } from "@src/utils/handleError.utils";
 
 @Injectable()
@@ -20,15 +20,27 @@ export class CategoriesService {
    */
   async getCategories(params: GetParamsDto) {
     const supabase = this.supabaseService.getAnonClient();
-    const { page, limit } = params;
+    const { page, limit, search, asc, order } = params;
     const { from, to } = getPaginationRange(page, limit);
 
-    const result = await supabase
-      .from("categories")
+    const query = supabase
+      .from("view_category_details")
       .select("*", { count: "exact" })
       .range(from, to);
 
-    return result;
+    const VALID_ORDERS = ["created_at", "assigned_to"];
+    if (search)
+      query.or(
+        `translations->>en.ilike.%${search}%,translations->>fi.ilike.%${search}%`,
+      );
+
+    query.order(VALID_ORDERS.includes(order) ? order : "created_at", {
+      ascending: asc,
+    });
+
+    const result = await query;
+    const pagination = getPaginationMeta(result.count, page, limit);
+    return { ...result, metadata: pagination };
   }
 
   /**

backend/src/modules/categories/dto/category.dto.ts

@@ -1,13 +1,44 @@
-import { IsNotEmpty, IsOptional } from "class-validator";
+import {
+  IsNotEmpty,
+  IsOptional,
+  IsUUID,
+  ValidateNested,
+  IsString,
+} from "class-validator";
+import { Type } from "class-transformer";
+
+class CategoryTranslationsDto {
+  @IsString()
+  @IsNotEmpty()
+  en: string;
+
+  @IsString()
+  @IsNotEmpty()
+  fi: string;
+}
 
 export class CreateCategoryDto {
+  @IsUUID()
+  id: string;
+
+  @ValidateNested()
+  @Type(() => CategoryTranslationsDto)
+  translations: CategoryTranslationsDto;
+
   @IsOptional()
-  parent_name: string;
-  @IsNotEmpty()
-  name: string;
+  @IsUUID()
+  parent_id?: string | null;
 }
 
 export class UpdateCategoryDto {
-  @IsNotEmpty()
-  name: string;
+  @IsUUID()
+  id: string;
+
+  @ValidateNested()
+  @Type(() => CategoryTranslationsDto)
+  translations: CategoryTranslationsDto;
+
+  @IsOptional()
+  @IsUUID()
+  parent_id?: string | null;
 }

backend/src/modules/categories/dto/params.dto.ts

@@ -1,8 +1,10 @@
-import { Type } from "class-transformer";
+import { Transform, Type } from "class-transformer";
 import {
+  IsBoolean,
   IsNotEmpty,
   IsNumber,
   IsOptional,
+  IsString,
   IsUUID,
   ValidateNested,
 } from "class-validator";
@@ -13,12 +15,25 @@ export class GetParamsDto {
   @Type(() => Number)
   @IsNumber()
   @IsOptional()
-  page: number = 1;
+  page: number;
 
   @Type(() => Number)
   @IsNumber()
   @IsOptional()
-  limit: number = 10;
+  limit: number;
+
+  @IsOptional()
+  @IsString()
+  search: string;
+
+  @IsOptional()
+  @IsString()
+  order: string;
+
+  @IsOptional()
+  @IsBoolean()
+  @Transform(({ value }) => value === "asc")
+  asc: boolean;
 }
 
 export class CreateParamsDto {

backend/src/modules/storage-items/storage-items.service.ts

@@ -143,6 +143,20 @@ export class StorageItemsService {
     org_filter?: string,
   ) {
     // Build a base query without range for counting and apply all filters
+
+    // Get nested categories of X category ID.
+    const matchingCategories: string[] = [];
+    if (category) {
+      const { data: categories } = await supabase.rpc(
+        "get_category_descendants",
+        {
+          category_uuid: category,
+        },
+      );
+      matchingCategories.push(
+        ...(categories as { id: string }[]).map((c) => c.id),
+      );
+    }
     const base = applyItemFilters(
       supabase
         .from("view_manage_storage_items")
@@ -153,7 +167,7 @@ export class StorageItemsService {
         isActive,
         tags,
         location_filter,
-        category,
+        categories: matchingCategories,
         from_date,
         to_date,
         availability_min,
@@ -193,7 +207,7 @@ export class StorageItemsService {
       isActive,
       tags,
       location_filter,
-      category,
+      categories: matchingCategories,
       from_date,
       to_date,
       availability_min,
@@ -202,7 +216,6 @@ export class StorageItemsService {
     });
 
     if (order_by) query.order(order_by ?? "created_at", { ascending });
-
     const result = await query;
 
     if (result.error) {
@@ -250,7 +263,19 @@ export class StorageItemsService {
     if (!supabase) {
       throw new BadRequestException("Supabase client is not initialized.");
     }
-
+    // Get nested categories of X category ID.
+    const matchingCategories: string[] = [];
+    if (category) {
+      const { data: categories } = await supabase.rpc(
+        "get_category_descendants",
+        {
+          category_uuid: category,
+        },
+      );
+      matchingCategories.push(
+        ...(categories as { id: string }[]).map((c) => c.id),
+      );
+    }
     // Build a base query with organization filtering
     const base = applyItemFilters(
       supabase
@@ -263,7 +288,7 @@ export class StorageItemsService {
         isActive,
         tags,
         location_filter,
-        category,
+        categories: matchingCategories,
       },
     );
     const countResult = await base;
@@ -299,7 +324,7 @@ export class StorageItemsService {
       isActive,
       tags,
       location_filter,
-      category,
+      categories: matchingCategories,
     });
 
     if (order_by) query.order(order_by ?? "created_at", { ascending });
@@ -324,10 +349,6 @@ export class StorageItemsService {
    * @returns An object containing the total count of storage items.
    */
   async getItemCount(req: AuthRequest, role: string, orgId: string) {
-    console.log("Request path:", req.path);
-    console.log("Headers:", req.headers);
-    console.log("ActiveRoleContext:", req.activeRoleContext);
-
     const supabase = req.supabase;
     const result = await supabase
       .from("storage_items")

backend/src/utils/pagination.ts

@@ -6,6 +6,7 @@ export function getPaginationRange(
   // ensure valid numbers - safer fallback
   const safePage = Number.isFinite(page) && page > 0 ? page : 1; // at least 1
   const safeLimit = Number.isFinite(limit) && limit > 0 ? limit : 10; // at least 10
+
   // calculations
   const from = (safePage - 1) * safeLimit;
   const to = from + safeLimit - 1;

backend/src/utils/storage-items.utils.ts

@@ -164,7 +164,7 @@ export function applyItemFilters<T extends FilterableQuery>(
     isActive?: boolean;
     tags?: string;
     location_filter?: string;
-    category?: string;
+    categories?: string[];
     from_date?: string;
     to_date?: string;
     availability_min?: number;
@@ -177,7 +177,7 @@ export function applyItemFilters<T extends FilterableQuery>(
     isActive,
     tags,
     location_filter,
-    category,
+    categories,
     from_date,
     to_date,
     availability_min,
@@ -197,7 +197,6 @@ export function applyItemFilters<T extends FilterableQuery>(
   }
 
   if (typeof isActive === "boolean") query.eq("is_active", isActive);
-
   if (tags) query.overlaps("tag_ids", tags.split(","));
 
   if (location_filter) {
@@ -210,7 +209,7 @@ export function applyItemFilters<T extends FilterableQuery>(
 
   if (org_filter) query.in("organization_id", org_filter.split(","));
 
-  if (category) query.in("en_item_type", category.split(","));
+  if (categories && categories.length > 0) query.in("category_id", categories);
 
   if (from_date) query.gte("created_at", from_date);
   if (to_date) query.lt("created_at", to_date);

common/items/categories.ts

@@ -0,0 +1,18 @@
+import { Database } from "@common/database.types";
+import { StripNullFrom } from "@common/helper.types";
+
+export type CategoryViewRow =
+  Database["public"]["Views"]["view_category_details"]["Row"];
+export type CategoryTranslations = {
+  translations: {
+    en: string;
+    fi: string;
+  };
+};
+
+export type Category = Omit<StripNullFrom<CategoryViewRow, "id" | "assigned_to" | "created_at">, "translations"> &
+  CategoryTranslations;
+export type CategoryInsert =
+  Database["public"]["Tables"]["categories"]["Insert"];
+export type CategoryUpdate =
+  Database["public"]["Tables"]["categories"]["Update"];