add fitur epic 7

index.ts

@@ -13,6 +13,7 @@ import vendorRoutes from './src/routes/admin/VendorRoute';
 import hospitalRoutes from './src/routes/admin/HospitalRoute';
 import salesHospitalRoutes from './src/routes/sales/HospitalRoute';
 import areaRoutes from './src/routes/sales/AreaRoute';
+import CategoryRoutes from './src/routes/admin/CategoryRoute';
 
 import './src/utils/Scheduler';
 
@@ -32,6 +33,7 @@ apiV1.use('/hospital', hospitalRoutes);
 apiV1.use('/hospital-area', salesHospitalRoutes);
 apiV1.use('/vendor', vendorRoutes);
 apiV1.use('/area', areaRoutes);
+apiV1.use('/category', CategoryRoutes);
 // apiV1.use('/vendor-sales', vendorSalesRoutes);
 
 app.get('/', (req: Request, res: Response) => {

prisma/migrations/20250802022241_add_table_epic_7/migration.sql

@@ -0,0 +1,28 @@
+-- CreateTable
+CREATE TABLE "categories" (
+    "id" TEXT NOT NULL,
+    "tag" TEXT NOT NULL,
+    "deskripsi" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+
+    CONSTRAINT "categories_pkey" PRIMARY KEY ("id")
+);
+
+-- CreateTable
+CREATE TABLE "category_links" (
+    "id" TEXT NOT NULL,
+    "category_id" TEXT NOT NULL,
+    "source_type" TEXT NOT NULL,
+    "source_id" TEXT,
+    "createdAt" TIMESTAMP(3) NOT NULL DEFAULT CURRENT_TIMESTAMP,
+    "updatedAt" TIMESTAMP(3) NOT NULL,
+    "deletedAt" TIMESTAMP(3),
+    "categoryId" TEXT,
+
+    CONSTRAINT "category_links_pkey" PRIMARY KEY ("id")
+);
+
+-- AddForeignKey
+ALTER TABLE "category_links" ADD CONSTRAINT "category_links_category_id_fkey" FOREIGN KEY ("category_id") REFERENCES "categories"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250802023321_update_field_in_table_category/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `deskripsi` on the `categories` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "categories" DROP COLUMN "deskripsi",
+ADD COLUMN     "description" TEXT;

prisma/migrations/20250802040342_update_field_in_table_category_link/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `categoryId` on the `category_links` table. All the data in the column will be lost.
+
+*/
+-- AlterTable
+ALTER TABLE "category_links" DROP COLUMN "categoryId",
+ALTER COLUMN "source_type" DROP NOT NULL;

prisma/migrations/20250802085021_update_table_category_link/migration.sql

@@ -0,0 +1,11 @@
+-- AddForeignKey
+ALTER TABLE "category_links" ADD CONSTRAINT "fk_categorylink_vendor" FOREIGN KEY ("source_id") REFERENCES "vendors"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "category_links" ADD CONSTRAINT "fk_categorylink_vendor_experience" FOREIGN KEY ("source_id") REFERENCES "vendor_experiences"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "category_links" ADD CONSTRAINT "fk_categorylink_status_history" FOREIGN KEY ("source_id") REFERENCES "status_histories"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "category_links" ADD CONSTRAINT "fk_categorylink_hospital" FOREIGN KEY ("source_id") REFERENCES "hospitals"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20250804032035_add_category_id_in_category_link/migration.sql

@@ -0,0 +1,11 @@
+-- DropForeignKey
+ALTER TABLE "category_links" DROP CONSTRAINT "fk_categorylink_hospital";
+
+-- DropForeignKey
+ALTER TABLE "category_links" DROP CONSTRAINT "fk_categorylink_status_history";
+
+-- DropForeignKey
+ALTER TABLE "category_links" DROP CONSTRAINT "fk_categorylink_vendor";
+
+-- DropForeignKey
+ALTER TABLE "category_links" DROP CONSTRAINT "fk_categorylink_vendor_experience";

prisma/schema.prisma

@@ -175,7 +175,7 @@ model UserArea {
 // }
 
 model VendorExperience {
-  id                    String    @id @default(uuid())
+  id                    String         @id @default(uuid())
   hospital_id           String
   vendor_id             String?
   status                String?
@@ -183,13 +183,13 @@ model VendorExperience {
   contract_expired_date DateTime?
   contract_value_min    BigInt?
   contract_value_max    BigInt?
-  positive_notes        String?   @db.Text
-  negative_notes        String?   @db.Text
+  positive_notes        String?        @db.Text
+  negative_notes        String?        @db.Text
   simrs_type            String
-  hospital              Hospital  @relation(fields: [hospital_id], references: [id])
-  vendor                Vendor?   @relation(fields: [vendor_id], references: [id])
-  createdAt             DateTime  @default(now())
-  updatedAt             DateTime  @updatedAt
+  hospital              Hospital       @relation(fields: [hospital_id], references: [id])
+  vendor                Vendor?        @relation(fields: [vendor_id], references: [id])
+  createdAt             DateTime       @default(now())
+  updatedAt             DateTime       @updatedAt
   deletedAt             DateTime?
 
   @@map("vendor_experiences")
@@ -212,17 +212,42 @@ model ExecutivesHistory {
 }
 
 model StatusHistory {
-  id          String         @id @default(uuid())
-  hospital_id String
-  user_id     String
-  old_status  ProgressStatus
-  new_status  ProgressStatus
-  note        String?        @db.Text
-  hospital    Hospital       @relation(fields: [hospital_id], references: [id])
-  user        UserKeycloak   @relation(fields: [user_id], references: [id])
-  createdAt   DateTime       @default(now())
-  updatedAt   DateTime       @updatedAt
-  deletedAt   DateTime?
+  id           String         @id @default(uuid())
+  hospital_id  String
+  user_id      String
+  old_status   ProgressStatus
+  new_status   ProgressStatus
+  note         String?        @db.Text
+  hospital     Hospital       @relation(fields: [hospital_id], references: [id])
+  user         UserKeycloak   @relation(fields: [user_id], references: [id])
+  createdAt    DateTime       @default(now())
+  updatedAt    DateTime       @updatedAt
+  deletedAt    DateTime?
 
   @@map("status_histories")
 }
+
+model Category {
+  id           String         @id @default(uuid())
+  tag          String
+  description  String?        @db.Text
+  CategoryLink CategoryLink[]
+  createdAt    DateTime       @default(now())
+  updatedAt    DateTime       @updatedAt
+  deletedAt    DateTime?
+
+  @@map("categories")
+}
+
+model CategoryLink {
+  id               String            @id @default(uuid())
+  category_id      String
+  source_type      String?
+  source_id        String?
+  createdAt        DateTime          @default(now())
+  updatedAt        DateTime          @updatedAt
+  deletedAt        DateTime?
+  Category         Category?         @relation(fields: [category_id], references: [id])
+
+  @@map("category_links")
+}

prisma/seeders/HospitalSeeder.ts

@@ -5,8 +5,8 @@ const prisma = new PrismaClient();
 
 export async function seedHospitals(): Promise<void> {
     try {
-        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: 'd4c7941b-a180-46dd-ab2c-e9e4d4a53e96' } });
-        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '9a9833ec-dd95-4445-b64e-343335815039' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '00c7e427-cbb7-408c-af44-e04747fd61fd' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: 'd27994a4-07b9-4ea8-bd62-3d6c51afed0e' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');

prisma/seeders/UserAreaSeeder.ts

@@ -3,8 +3,8 @@ import prisma from '../../src/prisma/PrismaClient';
 export async function seedUserAreas(): Promise<void> {
     try {
         // Ambil user dengan username 'sales1' dan 'sales2'
-        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: 'd4c7941b-a180-46dd-ab2c-e9e4d4a53e96' } });
-        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '9a9833ec-dd95-4445-b64e-343335815039' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '00c7e427-cbb7-408c-af44-e04747fd61fd' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: 'd27994a4-07b9-4ea8-bd62-3d6c51afed0e' } });
 
         if (!sales1 || !sales2) {
             throw new Error('User sales1 or sales2 not found');

prisma/seeders/VendorSeeder.ts

@@ -13,7 +13,7 @@ export async function seedVendors(): Promise<void> {
         // Cari user dengan username admin1
         const adminUser = await prisma.userKeycloak.findFirst({
             where: {
-                id: '9727ba1a-2266-4699-b3b9-9656f16c9785',
+                id: '06ccc7a6-9f6d-437f-9e1f-501a36077796',
             },
         });
 

src/controllers/admin/CategoryController.ts

@@ -0,0 +1,92 @@
+import { Request, Response } from 'express';
+import * as CategoryService from '../../services/admin/CategoryService';
+import { PaginationParam } from '../../utils/PaginationParams';
+import { errorResponse, messageSuccessResponse } from '../../utils/Response';
+import { validateCategoryStoreRequest, validateCategoryUpdateRequest, validateMergeCategoryStoreRequest } from '../../validators/admin/category/CategoryValidators';
+import { CustomRequest } from '../../types/token/CustomRequest';
+import { CategoryCollection } from '../../resources/admin/category/CategoryCollection';
+import { CategoryResource } from '../../resources/admin/category/CategoryResource';
+import { CategoryLinkCollection } from '../../resources/admin/category/CategoryUseCollection';
+
+export const getAllCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+
+        const { categories, total } = await CategoryService.getAllCategoryService({
+            page, limit, search, sortBy, orderBy
+        });
+
+        return CategoryCollection(req, res, categories, total, page, limit, 'Category data successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const data = await CategoryService.showCategoryService(id);
+        return CategoryResource(res, data, 'Success show category');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const storeCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateCategoryStoreRequest(req.body);
+        await CategoryService.storeCategoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success added category', 201);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const updateCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        const validatedData = validateCategoryUpdateRequest(req.body);
+        await CategoryService.updateCategoryService(validatedData, id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success update category');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const deleteCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const id = req.params.id;
+        await CategoryService.deleteCategoryService(id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success delete category');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const showUseCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const categoryId = req.params.id;
+        const { page, limit, search } = PaginationParam(req);
+
+        const { data, total } = await CategoryService.showUseCategoryService({
+            page,
+            limit,
+            search,
+            categoryId,
+        });
+
+        return CategoryLinkCollection(req, res, data, total, page, limit, 'Category usage data successfully retrieved');
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};
+
+export const mergeCategory = async (req: Request, res: Response): Promise<Response> => {
+    try {
+        const validatedData = validateMergeCategoryStoreRequest(req.body);
+        await CategoryService.mergeCategoryService(validatedData, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success merge category', 200);
+    } catch (err) {
+        return errorResponse(res, err);
+    }
+};

src/controllers/admin/HospitalController.ts

@@ -80,67 +80,4 @@ export const deleteHospital = async (req: Request, res: Response): Promise<Respo
     } catch (err) {
         return errorResponse(res, err);
     }
-};
-
-
-// const { HospitalCollection } = require('../../resources/admin/hospital/HospitalCollection.js');
-// const { HospitalResource } = require('../../resources/admin/hospital/HospitalResource.js');
-// const hospitalService = require('../../services/admin/HospitalService.js');
-// const { PaginationParam } = require('../../utils/PaginationParams.js');
-// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-// const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
-
-// exports.getAllHospital = async (req, res) => {
-//     try {
-//         const { page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status } = PaginationParam(req, ['province', 'city', 'type', 'ownership', 'progress_status']);
-
-//         const { hospitals, total } = await hospitalService.getAllHospitalService({
-//             page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status
-//         });
-
-//         return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.showHospital = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         const data = await hospitalService.showHospitalService(id);
-//         return HospitalResource(res, data, 'Success show hospital');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.storeHospital = async (req, res) => {
-//     try {
-//         const validatedData = validateStoreHospitalRequest(req.body);
-//         await hospitalService.storeHospitalService(validatedData, req);
-//         return messageSuccessResponse(res, 'Success added hospital', 201);
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.updateHospital = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         const validatedData = validateUpdateHospitalRequest(req.body);
-//         await hospitalService.updateHospitalService(validatedData, id, req);
-//         return messageSuccessResponse(res, 'Success update hospital');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.deleteHospital = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         await hospitalService.deleteHospitalService(id, req);
-//         return messageSuccessResponse(res, 'Success delete hospital');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
+};

src/controllers/admin/VendorController.ts

@@ -43,9 +43,8 @@ export const storeVendor = async (req: Request, res: Response): Promise<Response
 
 export const updateVendor = async (req: Request, res: Response): Promise<Response> => {
     try {
-        const id: string = req.params.id;
         const validatedData = validateUpdateVendorRequest(req.body);
-        await VendorService.updateVendorService(validatedData, id, req as CustomRequest);
+        await VendorService.updateVendorService(validatedData, req as CustomRequest);
         return messageSuccessResponse(res, 'Success update vendor');
     } catch (err) {
         return errorResponse(res, err);

src/controllers/admin/VendorExperienceController.ts

@@ -16,7 +16,7 @@ export const getAllVendorExperience = async (req: Request, res: Response): Promi
             req
         );
 
-        return VendorExperienceCollection(req, res, vendor_experiences, total, page, limit, 'Vendor experience successfully retrieved');
+        return await VendorExperienceCollection(req, res, vendor_experiences, total, page, limit, 'Vendor experience successfully retrieved');
     } catch (err) {
         return errorResponse(res, err);
     }
@@ -25,7 +25,7 @@ export const getAllVendorExperience = async (req: Request, res: Response): Promi
 export const showVendorExperience = async (req: Request, res: Response) => {
     try {
         const data = await VendorExperienceService.showVendorExperienceService(req);
-        return VendorExperienceResource(res, data, 'Success show vendor experience');
+        return await VendorExperienceResource(res, data, 'Success show vendor experience');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/sales/HospitalController.ts

@@ -24,24 +24,22 @@ export const getAllHospitalByArea = async (req: any, res: Response): Promise<Res
     }
 };
 
-// POST Store Hospital
 export const storeHospital = async (req: Request, res: Response): Promise<Response> => {
     try {
         const validatedData = validateStoreHospitalRequest(req.body);
         await HospitalController.storeHospitalService(validatedData, req as CustomRequest);
-        return messageSuccessResponse(res, "Success added hospital", 201);
+        return messageSuccessResponse(res, 'Success added hospital', 201);
     } catch (err) {
         return errorResponse(res, err);
     }
 };
 
-// PATCH/PUT Update Hospital
 export const updateHospital = async (req: Request, res: Response): Promise<Response> => {
     try {
         const id = req.params.id;
         const validatedData = validateUpdateHospitalRequest(req.body);
         await HospitalController.updateHospitalService(validatedData, id, req as CustomRequest);
-        return messageSuccessResponse(res, "Success update hospital");
+        return messageSuccessResponse(res, 'Success update hospital');
     } catch (err) {
         return errorResponse(res, err);
     }

src/repository/admin/CategoryLinkRepository.ts

@@ -0,0 +1,32 @@
+import prisma from '../../prisma/PrismaClient';
+import { Prisma } from '@prisma/client';
+import { now } from '../../utils/TimeLocal';
+
+const CategoryLinkRepository = {
+    create: async (data: Prisma.CategoryLinkUncheckedCreateInput) => {
+        return prisma.categoryLink.create({ data });
+    },
+
+    findBySource: async (source_type: string, source_id: string) => {
+        return prisma.categoryLink.findMany({
+            where: {
+                source_id,
+                source_type,
+                deletedAt: null,
+            },
+        });
+    },
+
+    deleteById: async (id: string) => {
+        return prisma.categoryLink.update({
+            where: {
+                id,
+            },
+            data: {
+                deletedAt: now().toDate(),
+            },
+        });
+    },
+};
+
+export default CategoryLinkRepository;

src/repository/admin/CategoryRepository.ts

@@ -0,0 +1,151 @@
+import prisma from '../../prisma/PrismaClient';
+import { Prisma } from '@prisma/client';
+
+interface FindAllParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.CategoryWhereInput;
+    orderBy?: Prisma.CategoryOrderByWithRelationInput;
+}
+
+interface FindAllCategoryLinkParams {
+    skip?: number;
+    take?: number;
+    where?: Prisma.CategoryLinkWhereInput;
+    orderBy?: Prisma.CategoryLinkOrderByWithRelationInput;
+}
+
+const CategoryRepository = {
+    findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
+        const categories = await prisma.category.findMany({
+            where,
+            skip,
+            take,
+            orderBy,
+            select: {
+                id: true,
+                tag: true,
+                description: true,
+                createdAt: true,
+                updatedAt: true,
+                _count: {
+                    select: {
+                        CategoryLink: {
+                            where: {
+                                deletedAt: null,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        const formattedCategories = categories.map(v => {
+            const { _count, ...rest } = v;
+            return {
+                ...rest,
+                count_use_tags: _count.CategoryLink || 0,
+            };
+        });
+
+        return formattedCategories;
+    },
+
+    countAll: async (where?: Prisma.CategoryWhereInput): Promise<number> => {
+        return prisma.category.count({ where });
+    },
+
+    findById: async (id: string) => {
+        const category = await prisma.category.findFirst({
+            where: {
+                id,
+                deletedAt: null,
+            },
+            select: {
+                id: true,
+                tag: true,
+                description: true,
+                createdAt: true,
+                updatedAt: true,
+                _count: {
+                    select: {
+                        CategoryLink: {
+                            where: {
+                                deletedAt: null,
+                            },
+                        },
+                    },
+                },
+            },
+        });
+
+        if (!category) return null;
+
+        const { _count, ...rest } = category;
+        return {
+            ...rest,
+            count_use: _count.CategoryLink || 0,
+        };
+    },
+
+    findByTag: async (tag: string) => {
+        return prisma.category.findFirst({
+            where: {
+                tag: {
+                    equals: tag,
+                    mode: "insensitive",
+                },
+                deletedAt: null,
+            },
+        });
+    },
+
+    create: async (data: Prisma.CategoryCreateInput) => {
+        return prisma.category.create({ data });
+    },
+
+    update: async (id: string, data: Prisma.CategoryUpdateInput) => {
+        return prisma.category.update({
+            where: { id },
+            data,
+        });
+    },
+
+    findByCategoryId: async (categoryId: string) => {
+        return prisma.categoryLink.findMany({
+            where: {
+                category_id: categoryId,
+                deletedAt: null
+            },
+            select: {
+                id: true,
+                source_id: true,
+                source_type: true,
+                // category_id: true,
+                createdAt: true,
+                updatedAt: true,
+            }
+        });
+    },
+
+    findAllCategoryLink: async ({ skip, take, where, }: FindAllCategoryLinkParams) => {
+        return prisma.categoryLink.findMany({
+            where,
+            skip,
+            take,
+            select: {
+                id: true,
+                source_id: true,
+                source_type: true,
+                createdAt: true,
+                updatedAt: true,
+            },
+        });
+    },
+
+    countAllCategoryLink: async (where: Prisma.CategoryLinkWhereInput) => {
+        return prisma.categoryLink.count({ where });
+    },
+};
+
+export default CategoryRepository;

src/resources/admin/category/CategoryCollection.ts

@@ -0,0 +1,24 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { CategoryDTO } from '../../../types/admin/category/CategoryDTO';
+
+const formatItem = (item: CategoryDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const CategoryCollection = (req: Request, res: Response, data: CategoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success') => {
+    const formattedData = data.map(formatItem);
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
+
+    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+};

src/resources/admin/category/CategoryResource.ts

@@ -0,0 +1,37 @@
+import { Response } from 'express';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { CategoryDTO } from '../../../types/admin/category/CategoryDTO';
+
+const formatItem = (item: CategoryDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const CategoryResource = (res: Response, data: CategoryDTO, message: string = 'Success') => {
+    const formattedData = formatItem(data);
+
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formattedData,
+    });
+};
+
+// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+
+// const formatItem = (item) => ({
+//     ...item,
+//     createdAt: formatISOWithoutTimezone(item.createdAt),
+//     updatedAt: formatISOWithoutTimezone(item.updatedAt)
+// });
+
+// exports.ProvinceResource = (res, data, message = 'Success') => {
+//     const formattedData = formatItem(data);
+
+//     return res.status(200).json({
+//         success: true,
+//         message,
+//         data: formattedData
+//     });
+// };

src/resources/admin/category/CategoryUseCollection.ts

@@ -0,0 +1,92 @@
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { CategoryLinkUseDTO } from '../../../types/admin/category_link/CategoryLinkDTO';
+
+const formatItem = (item: CategoryLinkUseDTO) => {
+    const base = {
+        id: item.id,
+        source_type: item.source_type
+            ? item.source_type
+                .replace(/_/g, ' ')
+                .toLowerCase()
+                .replace(/^./, (l) => l.toUpperCase())
+            : undefined,
+        createdAt: formatISOWithoutTimezone(item.createdAt),
+        updatedAt: formatISOWithoutTimezone(item.updatedAt),
+    };
+
+    if (item.vendor_experience) {
+        return {
+            ...base,
+            vendor_experience: {
+                id: item.vendor_experience.id,
+                status: item.vendor_experience.status,
+                simrs_type: item.vendor_experience.simrs_type,
+                contract_start_date: formatDateOnly(item.vendor_experience.contract_start_date),
+                contract_expired_date: formatDateOnly(item.vendor_experience.contract_expired_date),
+                contract_value_min: item.vendor_experience.contract_value_min,
+                contract_value_max: item.vendor_experience.contract_value_max,
+                positive_notes: item.vendor_experience.positive_notes,
+                negative_notes: item.vendor_experience.negative_notes,
+            },
+        };
+    }
+
+    if (item.status_history) {
+        return {
+            ...base,
+            status_history: {
+                id: item.status_history.id,
+                old_status: item.status_history.old_status,
+                new_status: item.status_history.new_status,
+                note: item.status_history.note,
+            },
+        };
+    }
+
+    if (item.hospital) {
+        return {
+            ...base,
+            hospital: {
+                id: item.hospital.id,
+                name: item.hospital.name,
+                hospital_code: item.hospital.hospital_code,
+                ownership: item.hospital.ownership,
+                address: item.hospital.address,
+                contact: item.hospital.contact,
+                progress_status: item.hospital.progress_status,
+                note: item.hospital.note,
+            },
+        };
+    }
+
+    if (item.vendor) {
+        return {
+            ...base,
+            vendor: {
+                id: item.vendor.id,
+                name: item.vendor.name,
+                name_pt: item.vendor.name_pt,
+                strengths: item.vendor.strengths,
+                weaknesses: item.vendor.weaknesses,
+                website: item.vendor.website,
+            },
+        };
+    }
+
+    return base;
+};
+
+export const CategoryLinkCollection = (
+    req: Request,
+    res: Response,
+    data: CategoryLinkUseDTO[] = [],
+    total: number | undefined,
+    page: number = 1,
+    limit: number = 10,
+    message: string = 'Success'
+) => {
+    const formattedData = data.map(formatItem);
+    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
+};

src/resources/admin/category/TransformCategoryLinkUse.ts

@@ -0,0 +1,63 @@
+import { CategoryLinkUseDTO } from '../../../types/admin/category_link/CategoryLinkDTO';
+
+export const TransformCategoryLinkUse = (
+    link: any,
+    source_type: string,
+    data: any
+): CategoryLinkUseDTO => {
+    return {
+        id: link.id,
+        source_type: link.source_type,
+        category_id: link.category_id,
+        createdAt: link.createdAt,
+        updatedAt: link.updatedAt,
+        vendor_experience:
+            (source_type === 'vendor_experience_positive_notes' ||
+                source_type === 'vendor_experience_negative_notes') && data
+                ? {
+                    id: data.id,
+                    status: data.status,
+                    contract_start_date: data.contract_start_date,
+                    contract_expired_date: data.contract_expired_date,
+                    contract_value_min: data.contract_value_min,
+                    contract_value_max: data.contract_value_max,
+                    positive_notes: data.positive_notes,
+                    negative_notes: data.negative_notes,
+                    simrs_type: data.simrs_type,
+                }
+                : null,
+        status_history:
+            source_type === 'status_history_notes' && data
+                ? {
+                    id: data.id,
+                    old_status: data.old_status,
+                    new_status: data.new_status,
+                    note: data.note,
+                }
+                : null,
+        hospital:
+            source_type === 'hospital_notes' && data
+                ? {
+                    id: data.id,
+                    name: data.name,
+                    hospital_code: data.hospital_code,
+                    ownership: data.ownership,
+                    address: data.address,
+                    contact: data.contact,
+                    progress_status: data.progress_status,
+                    note: data.note,
+                }
+                : null,
+        vendor:
+            (source_type === 'vendor_strength_notes' || source_type === 'vendor_weaknesses_notes') && data
+                ? {
+                    id: data.id,
+                    name: data.name,
+                    name_pt: data.name_pt,
+                    strengths: data.strengths,
+                    weaknesses: data.weaknesses,
+                    website: data.website,
+                }
+                : null,
+    };
+};

src/resources/admin/hospital/HospitalCollection.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { HospitalDTO } from '../../../types/admin/hospital/HospitalDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: HospitalDTO) => ({
     ...item,
@@ -9,8 +10,46 @@ const formatItem = (item: HospitalDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const HospitalCollection = (req: Request, res: Response, data: HospitalDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const HospitalCollection = async (req: Request, res: Response, data: HospitalDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['hospital_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { note: string[] }>();
+    for (const id of ids) {
+        tagMap.set(id, { note: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'hospital_notes') {
+            current.note.push(categoryTag);
+        }
+    }
+
+    const formattedData = data.map(item => {
+        const { created_by, ...rest } = item;
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...rest,
+            note_tags: tags?.note ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -29,100 +68,4 @@ export const HospitalCollection = (req: Request, res: Response, data: HospitalDT
         limit,
         message,
     });
-};
-
-
-// ==============================================
-
-// import { Request, Response } from "express";
-// import { ListResponse } from "../../../utils/ListResponse";
-// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
-
-// // Tipe untuk item rumah sakit
-// interface HospitalItem {
-//     id: string;
-//     name: string;
-//     created_by?: string;
-//     createdAt: Date | string;
-//     updatedAt: Date | string;
-//     [key: string]: any;
-// }
-
-// // Fungsi transform per item
-// const transformHospitalList = async (data: HospitalItem[] = []): Promise<any[]> => {
-//     return Promise.all(
-//         data.map(async ({ created_by, ...rest }) => {
-//             // const name = await getUserNameById(created_by);
-
-//             return {
-//                 ...rest,
-//                 // user: {
-//                 //   id: created_by,
-//                 //   name: name,
-//                 // },
-//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
-//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
-//             };
-//         })
-//     );
-// };
-
-// // Collection yang async
-// export const HospitalCollection = async ({
-//     req,
-//     res,
-//     data = [],
-//     total = 0,
-//     page = 1,
-//     limit = 10,
-//     message = "Success",
-// }: {
-//     req: Request;
-//     res: Response;
-//     data: HospitalItem[];
-//     total: number;
-//     page: number;
-//     limit: number;
-//     message?: string;
-// }) => {
-//     const formatted = await transformHospitalList(data);
-
-//     return ListResponse({
-//         req,
-//         res,
-//         data: formatted,
-//         total,
-//         page,
-//         limit,
-//         message,
-//     });
-// };
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-// // Fungsi transform per item
-// const transformHospitalList = async (data = []) => {
-//     return Promise.all(data.map(async ({ created_by, ...rest }) => {
-//         // const name = await getUserNameById(created_by);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: created_by,
-//             //     name: name
-//             // },
-//             createdAt: formatISOWithoutTimezone(rest.createdAt),
-//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-//         };
-//     }));
-// };
-
-// // Collection yang async
-// exports.HospitalCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformHospitalList(data);
-
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+};

src/resources/admin/hospital/HospitalResource.ts

@@ -1,6 +1,7 @@
 import { Response } from 'express';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { HospitalDTO } from '../../../types/admin/hospital/HospitalDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: HospitalDTO) => ({
     ...item,
@@ -8,58 +9,32 @@ const formatItem = (item: HospitalDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const HospitalResource = (res: Response, data: HospitalDTO, message: string = 'Success'): Response => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData,
+export const HospitalResource = async (res: Response, data: HospitalDTO, message: string = 'Success'): Promise<Response> => {
+    const tags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: data.id,
+            source_type: { in: ['hospital_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
     });
-};
-// ==================================================
-
-// import { Response } from 'express';
-// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-
-// interface HospitalItem {
-//     createdAt: string | Date;
-//     updatedAt: string | Date;
-//     [key: string]: any;
-// }
 
-// export const HospitalResource = (
-//     res: Response,
-//     data: HospitalItem,
-//     message: string = 'Success'
-// ) => {
-//     const formattedData = {
-//         ...data,
-//         createdAt: formatISOWithoutTimezone(data.createdAt),
-//         updatedAt: formatISOWithoutTimezone(data.updatedAt)
-//     };
+    const note_tags = tags
+        .filter(t => t.source_type === 'hospital_notes')
+        .map(t => t.Category?.tag ?? '');
 
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+    const { created_by, ...cleanedData } = data;
 
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
+    const formatted = {
+        ...formatItem(cleanedData),
+        note_tags,
+    };
 
-// const formatItem = (item) => ({
-//     ...item,
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt)
-// });
-
-// exports.HospitalResource = (res, data, message = 'Success') => {
-//     const formattedData = formatItem(data);
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+    return res.status(200).json({
+        success: true,
+        message,
+        data: formatted,
+    });
+};

src/resources/admin/sales/SalesCollection.js

@@ -1,22 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-
-const formatItem = (item) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt)
-});
-
-exports.SalesCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-    const formattedData = data.map(formatItem);
-
-    if (typeof total !== 'number') {
-        return res.status(200).json({
-            success: true,
-            message,
-            data: Array.isArray(formattedData)
-        });
-    }
-
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};

src/resources/admin/sales/SalesResource.js

@@ -1,17 +0,0 @@
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
-
-const formatItem = (item) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt)
-});
-
-exports.SalesResource = (res, data, message = 'Success') => {
-    const formattedData = formatItem(data);
-
-    return res.status(200).json({
-        success: true,
-        message,
-        data: formattedData
-    });
-};

src/resources/admin/status_history/StatusHistoryCollection.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { StatusHistoryDTO } from '../../../types/admin/status_history/StatusHistoryDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: StatusHistoryDTO) => ({
     ...item,
@@ -9,8 +10,46 @@ const formatItem = (item: StatusHistoryDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const StatusHistoryCollection = (req: Request, res: Response, data: StatusHistoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const StatusHistoryCollection = async (req: Request, res: Response, data: StatusHistoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['status_history_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { note: string[]; }>();
+    for (const id of ids) {
+        tagMap.set(id, { note: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'status_history_notes') {
+            current.note.push(categoryTag);
+        }
+    }
+
+    // Gabungkan dan format
+    const formattedData = data.map(item => {
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...item,
+            note_tags: tags?.note ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -29,109 +68,4 @@ export const StatusHistoryCollection = (req: Request, res: Response, data: Statu
         limit,
         message,
     });
-};
-
-// import { ListResponse } from "../../../utils/ListResponse";
-// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
-
-// // interface StatusHistory {
-// //     id: string;
-// //     hospital_id: string;
-// //     user_id: string;
-// //     old_status: 'cari_data' | 'dihubungi' | 'negosiasi' | 'follow_up' | 'mou' | 'onboarded' | 'tidak_berminat';
-// //     new_status: 'cari_data' | 'dihubungi' | 'negosiasi' | 'follow_up' | 'mou' | 'onboarded' | 'tidak_berminat';
-// //     note?: string | null;
-// //     createdAt: string | Date | null;
-// //     updatedAt: string | Date | null;
-// // }
-
-// interface StatusHistoryWithRelations {
-//     id: string;
-//     old_status: string;
-//     new_status: string;
-//     note: string | null;
-//     createdAt: Date | string | null;
-//     updatedAt: Date | string | null;
-//     hospital: {
-//         id: string;
-//         name: string;
-//         progress_status: string;
-//     };
-//     user: {
-//         id: string;
-//         fullname: string;
-//     };
-// }
-
-
-// const transformStatusHistoryList = async (data: StatusHistoryWithRelations[] = []): Promise<StatusHistoryWithRelations[]> => {
-//     return Promise.all(
-//         data.map(async (rest): Promise<StatusHistoryWithRelations> => {
-//             // const name = await getUserNameById(rest.user_id);
-
-//             return {
-//                 ...rest,
-//                 // user: {
-//                 //   id: rest.user_id,
-//                 //   name,
-//                 // },
-//                 note: rest.note?.trim() === '' ? null : rest.note ?? null,
-//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
-//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
-//             };
-//         })
-//     );
-// };
-
-// interface StatusHistoryCollectionParams {
-//     req: any;
-//     res: any;
-//     data?: StatusHistoryWithRelations[];
-//     total?: number;
-//     page?: number;
-//     limit?: number;
-//     message?: string;
-// }
-
-// export const StatusHistoryCollection = async ({
-//     req,
-//     res,
-//     data = [],
-//     total = 0,
-//     page = 1,
-//     limit = 10,
-//     message = 'Success',
-// }: StatusHistoryCollectionParams) => {
-//     const formatted = await transformStatusHistoryList(data);
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
-
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-// const transformStatusHistoryList = async (data = []) => {
-//     return Promise.all(data.map(async ({ ...rest }) => {
-//         // const name = await getUserNameById(user_id);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: user_id,
-//             //     name: name
-//             // },
-//             note: rest.note?.trim() === '' ? null : rest.note,
-//             createdAt: formatISOWithoutTimezone(rest.createdAt),
-//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-//         };
-//     }));
-// };
-
-// // Collection yang async
-// exports.StatusHistoryCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformStatusHistoryList(data);
-
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+};

src/resources/admin/vendor/VendorCollection.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: VendorDTO) => ({
     ...item,
@@ -9,8 +10,49 @@ const formatItem = (item: VendorDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const VendorCollection = (req: Request, res: Response, data: VendorDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const VendorCollection = async (req: Request, res: Response, data: VendorDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['vendor_strength_notes', 'vendor_weaknesses_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { strength: string[]; weaknesses: string[] }>();
+    for (const id of ids) {
+        tagMap.set(id, { strength: [], weaknesses: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'vendor_strength_notes') {
+            current.strength.push(categoryTag);
+        } else if (tag.source_type === 'vendor_weaknesses_notes') {
+            current.weaknesses.push(categoryTag);
+        }
+    }
+
+    // Gabungkan dan format
+    const formattedData = data.map(item => {
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...item,
+            strengths_tags: tags?.strength ?? [],
+            weaknesses_tags: tags?.weaknesses ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -29,84 +71,24 @@ export const VendorCollection = (req: Request, res: Response, data: VendorDTO[]
         limit,
         message,
     });
-};
-
-// import { ListResponse } from "../../../utils/ListResponse";
-// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-// import { getUserNameById } from "../../../utils/CheckUserKeycloak";
-
-// // Jika tahu struktur data vendor, ganti `any` dengan interface Vendor
-// interface Vendor {
-//     createdAt: Date | string | null;
-//     updatedAt: Date | string | null;
-//     [key: string]: any; // untuk properti lainnya
-// }
-
-// const transformVendorList = async (data: Vendor[] = []): Promise<Vendor[]> => {
-//     return Promise.all(
-//         data.map(async ({ ...rest }) => {
-//             // const name = await getUserNameById(rest.created_by);
-
-//             return {
-//                 ...rest,
-//                 // user: {
-//                 //     id: rest.created_by,
-//                 //     name: name
-//                 // },
-//                 createdAt: formatISOWithoutTimezone(rest.createdAt),
-//                 updatedAt: formatISOWithoutTimezone(rest.updatedAt),
-//             };
-//         })
-//     );
-// };
-
-// interface VendorCollectionParams {
-//     req: any;
-//     res: any;
-//     data?: Vendor[];
-//     total?: number;
-//     page?: number;
-//     limit?: number;
-//     message?: string;
-// }
-
-// export const VendorCollection = async ({
-//     req,
-//     res,
-//     data = [],
-//     total = 0,
-//     page = 1,
-//     limit = 10,
-//     message = "Success",
-// }: VendorCollectionParams): Promise<any> => {
-//     const formatted = await transformVendorList(data);
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
-
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
-
-// const transformVendorList = async (data = []) => {
-//     return Promise.all(data.map(async ({ ...rest }) => {
-//         // const name = await getUserNameById(created_by);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: created_by,
-//             //     name: name
-//             // },
-//             createdAt: formatISOWithoutTimezone(rest.createdAt),
-//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-//         };
-//     }));
-// };
-
-// // Collection yang async
-// exports.VendorCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformVendorList(data);
 
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+    // const formattedData = data.map(formatItem);
+
+    // if (typeof total !== 'number') {
+    //     return res.status(200).json({
+    //         success: true,
+    //         message,
+    //         data: Array.isArray(formattedData),
+    //     });
+    // }
+
+    // return ListResponse({
+    //     req,
+    //     res,
+    //     data: formattedData,
+    //     total,
+    //     page,
+    //     limit,
+    //     message,
+    // });
+};

src/resources/admin/vendor/VendorResource.ts

@@ -1,85 +1,41 @@
 import { Response } from 'express';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
+import prisma from '../../../prisma/PrismaClient';
+
+export const VendorResource = async (res: Response, data: VendorDTO, message: string = 'Success'): Promise<Response> => {
+    const tags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: data.id,
+            source_type: { in: ['vendor_strength_notes', 'vendor_weaknesses_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    const strengths_tags = tags
+        .filter(t => t.source_type === 'vendor_strength_notes')
+        .map(t => t.Category?.tag ?? '');
 
-const formatItem = (item: VendorDTO) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
+    const weaknesses_tags = tags
+        .filter(t => t.source_type === 'vendor_weaknesses_notes')
+        .map(t => t.Category?.tag ?? '');
 
-export const VendorResource = (res: Response, data: VendorDTO, message: string = 'Success'): Response => {
-    const formattedData = formatItem(data);
+    const formatted = {
+        ...data,
+        createdAt: formatISOWithoutTimezone(data.createdAt),
+        updatedAt: formatISOWithoutTimezone(data.updatedAt),
+        strengths: data.strengths,
+        weaknesses: data.weaknesses,
+        strengths_tags,
+        weaknesses_tags,
+    };
 
     return res.status(200).json({
         success: true,
         message,
-        data: formattedData,
+        data: formatted,
     });
 };
-
-// import { Response } from "express";
-// import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-// import { VendorDTO } from '../../../types/admin/vendor/VendorDTO';
-
-// // Kalau ada struktur pasti dari vendor, ganti `any` dengan tipe interface
-// interface Vendor {
-//     createdAt: Date | string | null;
-//     updatedAt: Date | string | null;
-//     [key: string]: any;
-// }
-
-// const formatItem = ({ item }: { item: Vendor }): Vendor => {
-//     const { ...rest } = item;
-
-//     return {
-//         ...rest,
-//         // user: {
-//         //     id: item.created_by,
-//         //     name: userName
-//         // },
-//         createdAt: formatISOWithoutTimezone(item.createdAt),
-//         updatedAt: formatISOWithoutTimezone(item.updatedAt)
-//     };
-// };
-
-// export const VendorResource = (
-//     res: Response,
-//     item: Vendor,
-//     message = "Success"
-// ): Response => {
-//     const formattedData = formatItem({ item });
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
-
-
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
-
-// const formatItem = ({ item }) => {
-//     const { ...rest } = item;
-
-//     return {
-//         ...rest,
-//         // user: {
-//         //     id: created_by,
-//         //     name: userName
-//         // },
-//         createdAt: formatISOWithoutTimezone(item.createdAt),
-//         updatedAt: formatISOWithoutTimezone(item.updatedAt)
-//     };
-// };
-
-// exports.VendorResource = (res, item, message = 'Success') => {
-//     const formattedData = formatItem({ item });
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };

src/resources/admin/vendor_experience/VendorExperienceCollection.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: VendorExperienceDTO) => ({
     ...item,
@@ -13,8 +14,57 @@ const formatItem = (item: VendorExperienceDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const VendorExperienceCollection = (req: Request, res: Response, data: VendorExperienceDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const VendorExperienceCollection = async (
+    req: Request,
+    res: Response,
+    data: VendorExperienceDTO[] = [],
+    total: number | null = null,
+    page: number = 1,
+    limit: number = 10,
+    message: string = 'Success'
+): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['vendor_experience_positive_notes', 'vendor_experience_negative_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { positive: string[]; negative: string[] }>();
+    for (const id of ids) {
+        tagMap.set(id, { positive: [], negative: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'vendor_experience_positive_notes') {
+            current.positive.push(categoryTag);
+        } else if (tag.source_type === 'vendor_experience_negative_notes') {
+            current.negative.push(categoryTag);
+        }
+    }
+
+    // Gabungkan dan format
+    const formattedData = data.map(item => {
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...item,
+            positive_notes_tags: tags?.positive ?? [],
+            negative_notes_tags: tags?.negative ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -33,68 +83,4 @@ export const VendorExperienceCollection = (req: Request, res: Response, data: Ve
         limit,
         message,
     });
-};
-
-// import { Request, Response } from 'express';
-// import { ListResponse } from '../../../utils/ListResponse';
-// import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
-// import { VendorHistoryDTO } from '../../../types/VendorHistoryDTO';
-
-// const formatItem = (item: VendorHistoryDTO): VendorHistoryDTO => ({
-//     ...item,
-//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-//     contract_start_date: formatDateOnly(item.contract_start_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// export const VendorExperienceCollection = (
-//     req: Request,
-//     res: Response,
-//     data: any[] = [],
-//     total: number | null = null,
-//     page: number = 1,
-//     limit: number = 10,
-//     message: string = 'Success'
-// ): Response => {
-//     const formattedData: VendorHistoryDTO[] = data.map(formatItem);
-
-//     if (typeof total !== 'number') {
-//         return res.status(200).json({
-//             success: true,
-//             message,
-//             data: Array.isArray(formattedData),
-//         });
-//     }
-
-//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-// };
-
-// const { ListResponse } = require("../../../utils/ListResponse.js");
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-//     contract_start_date: formatDateOnly(item.contract_start_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.VendorExperienceCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-//     const formattedData = data.map(formatItem);
-
-//     if (typeof total !== 'number') {
-//         return res.status(200).json({
-//             success: true,
-//             message,
-//             data: Array.isArray(formattedData)
-//         });
-//     }
-
-//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-// };
+};

src/resources/admin/vendor_experience/VendorExperienceResource.ts

@@ -1,8 +1,28 @@
 import { Response } from 'express';
 import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+import prisma from '../../../prisma/PrismaClient';
+
+export const VendorExperienceResource = async (res: Response, data: VendorExperienceDTO, message: string = 'Success'): Promise<Response> => {
+    const tags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: data.id,
+            source_type: { in: ['vendor_experience_positive_notes', 'vendor_experience_negative_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    const positive_notes_tags = tags
+        .filter(t => t.source_type === 'vendor_experience_positive_notes')
+        .map(t => t.Category?.tag ?? '');
+
+    const negative_notes_tags = tags
+        .filter(t => t.source_type === 'vendor_experience_negative_notes')
+        .map(t => t.Category?.tag ?? '');
 
-export const VendorExperienceResource = (res: Response, data: VendorExperienceDTO, message: string = 'Success'): Response => {
     const { vendor_id, ...restData } = data;
 
     const formatted = {
@@ -20,10 +40,10 @@ export const VendorExperienceResource = (res: Response, data: VendorExperienceDT
             : null,
         contract_start_date: formatDateOnly(data.contract_start_date),
         contract_expired_date: formatDateOnly(data.contract_expired_date),
-        // contract_value_min: Number(data.contract_value_min),
-        // contract_value_max: Number(data.contract_value_max),
         contract_value_min: data.contract_value_min !== null ? Number(data.contract_value_min) : null,
         contract_value_max: data.contract_value_max !== null ? Number(data.contract_value_max) : null,
+        positive_notes_tags,
+        negative_notes_tags,
         createdAt: formatISOWithoutTimezone(data.createdAt),
         updatedAt: formatISOWithoutTimezone(data.updatedAt),
     };
@@ -33,73 +53,4 @@ export const VendorExperienceResource = (res: Response, data: VendorExperienceDT
         message,
         data: formatted,
     });
-};
-
-// src/resources/VendorExperienceResource.ts
-// import { Response } from 'express';
-// import { VendorHistoryDTO } from '../../../types/VendorHistoryDTO';
-// import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
-
-// export const formatVendorExperience = (item: VendorHistoryDTO): VendorHistoryDTO => ({
-//     ...item,
-//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-//     contract_start_date: formatDateOnly(item.contract_start_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// export const VendorExperienceResource = (res: Response, data: any, message: string) => {
-//     const { vendor_id, ...restData } = data;
-
-//     const formatted = {
-//         ...restData,
-//         vendor: data.vendor
-//             ? {
-//                 id: data.vendor.id,
-//                 name: data.vendor.name,
-//                 name_pt: data.vendor.name_pt,
-//                 strengths: data.vendor.strengths,
-//                 weaknesses: data.vendor.weaknesses,
-//                 website: data.vendor.website,
-//                 created_by: data.vendor.created_by,
-//             }
-//             : null,
-//         contract_start_date: formatDateOnly(data.contract_start_date),
-//         contract_expired_date: formatDateOnly(data.contract_expired_date),
-//         contract_value_min: Number(data.contract_value_min),
-//         contract_value_max: Number(data.contract_value_max),
-//         createdAt: formatISOWithoutTimezone(data.createdAt),
-//         updatedAt: formatISOWithoutTimezone(data.updatedAt),
-//     };
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formatted,
-//     });
-// };
-
-
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-//     contract_start_date: formatDateOnly(item.contract_start_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.VendorExperienceResource = (res, data, message = 'Success') => {
-//     const formattedData = formatItem(data);
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+};

src/resources/sales/area/UserAreaCollection.ts

@@ -29,78 +29,4 @@ export const UserAreaCollection = (req: Request, res: Response, data: AreaSalesD
         limit,
         message,
     });
-};
-
-// import { Request, Response } from 'express';
-// import { ListResponse } from '../../../utils/ListResponse';
-// import { getUserNameById } from '../../../utils/CheckUserKeycloak';
-// import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
-
-// interface Province {
-//     id: string;
-//     name: string;
-// }
-
-// interface Area {
-//     id: string;
-//     province: Province;
-//     createdAt: string | Date | null;
-//     updatedAt: string | Date | null;
-// }
-
-// interface UserAreaCollectionParams {
-//     req: Request;
-//     res: Response;
-//     data?: Area[];
-//     total?: number;
-//     page?: number;
-//     limit?: number;
-//     message?: string;
-// }
-
-// const transformArea = async (data: Area[] = []): Promise<Area[]> => {
-//     return Promise.all(data.map(async (item) => {
-//         return {
-//             ...item,
-//             createdAt: formatISOWithoutTimezone(item.createdAt),
-//             updatedAt: formatISOWithoutTimezone(item.updatedAt),
-//         };
-//     }));
-// };
-
-// export const UserAreaCollection = async ({
-//     req,
-//     res,
-//     data = [],
-//     total = 0,
-//     page = 1,
-//     limit = 10,
-//     message = 'Success',
-// }: UserAreaCollectionParams): Promise<Response> => {
-//     const formatted = await transformArea(data);
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
-
-
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak");
-// const { ListResponse } = require("../../../utils/ListResponse");
-
-// const transformArea = async (data = []) => {
-//     return Promise.all(data.map(async ({ ...rest }) => {
-//         // const name = await getUserNameById(user_id);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: user_id,
-//             //     name: name
-//             // },
-//         };
-//     }));
-// };
-
-// exports.UserAreaCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformArea(data);
-
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+};

src/resources/sales/executives_history/ExecutivesHistoriCollection.ts

@@ -31,30 +31,4 @@ export const ExecutivesHistoriCollection = (
     }
 
     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};
-
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     start_term: formatDateOnly(item.start_term),
-//     end_term: formatDateOnly(item.end_term),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.ExecutivesHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-//     const formattedData = data.map(formatItem);
-
-//     if (typeof total !== 'number') {
-//         return res.status(200).json({
-//             success: true,
-//             message,
-//             data: Array.isArray(formattedData)
-//         });
-//     }
-
-//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-// };
+};

src/resources/sales/executives_history/ExecutivesHistoriResource.ts

@@ -22,24 +22,4 @@ export const ExecutivesHistoriResource = (
         message,
         data: formattedData
     });
-};
-
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     start_term: formatDateOnly(item.start_term),
-//     end_term: formatDateOnly(item.end_term),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.ExecutivesHistoriResource = (res, data, message = 'Success') => {
-//     const formattedData = formatItem(data);
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+};

src/resources/sales/hospital/HospitalCollection.ts

@@ -1,38 +1,15 @@
-import { Request, Response } from "express";
-import { ListResponse } from "../../../utils/ListResponse";
-import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
-import { getUserNameById } from "../../../utils/CheckUserKeycloak";
+import { Request, Response } from 'express';
+import { ListResponse } from '../../../utils/ListResponse';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import prisma from '../../../prisma/PrismaClient';
+import { HospitalDTO } from '../../../types/sales/hospital/HospitalDTO';
 
-// Tipe untuk item rumah sakit
-interface HospitalItem {
-    id: string;
-    name: string;
-    created_by?: string;
-    createdAt: Date | string;
-    updatedAt: Date | string;
-    [key: string]: any;
-}
+const formatItem = (item: HospitalDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
 
-// Fungsi transform per item
-const transformHospitalList = async (data: HospitalItem[] = []): Promise<any[]> => {
-    return Promise.all(
-        data.map(async ({ created_by, ...rest }) => {
-            // const name = await getUserNameById(created_by);
-
-            return {
-                ...rest,
-                // user: {
-                //   id: created_by,
-                //   name: name,
-                // },
-                createdAt: formatISOWithoutTimezone(rest.createdAt),
-                updatedAt: formatISOWithoutTimezone(rest.updatedAt),
-            };
-        })
-    );
-};
-
-// Collection yang async
 export const HospitalCollection = async ({
     req,
     res,
@@ -44,50 +21,65 @@ export const HospitalCollection = async ({
 }: {
     req: Request;
     res: Response;
-    data: HospitalItem[];
+    data: HospitalDTO[];
     total: number;
     page: number;
     limit: number;
     message?: string;
 }) => {
-    const formatted = await transformHospitalList(data);
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: 'hospital_notes',
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_id
+    const tagMap = new Map<string, { note: string[] }>();
+    for (const id of ids) {
+        tagMap.set(id, { note: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        current.note.push(categoryTag);
+    }
+
+    const formattedData = data.map(item => {
+        const { created_by, ...rest } = item;
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...rest,
+            note_tags: tags?.note ?? [],
+        });
+    });
+
+    if (typeof total !== 'number') {
+        return res.status(200).json({
+            success: true,
+            message,
+            data: Array.isArray(formattedData),
+        });
+    }
 
     return ListResponse({
         req,
         res,
-        data: formatted,
+        data: formattedData,
         total,
         page,
         limit,
         message,
     });
-};
-
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-// // Fungsi transform per item
-// const transformHospitalList = async (data = []) => {
-//     return Promise.all(data.map(async ({ created_by, ...rest }) => {
-//         // const name = await getUserNameById(created_by);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: created_by,
-//             //     name: name
-//             // },
-//             createdAt: formatISOWithoutTimezone(rest.createdAt),
-//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-//         };
-//     }));
-// };
-
-// // Collection yang async
-// exports.HospitalCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformHospitalList(data);
-
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+};

src/resources/sales/hospital/HospitalResource.ts

@@ -1,52 +1,40 @@
 import { Response } from 'express';
-import { formatISOWithoutTimezone } from "../../../utils/FormatDate";
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { HospitalDTO } from '../../../types/sales/hospital/HospitalDTO';
+import prisma from '../../../prisma/PrismaClient';
+
+const formatItem = (item: HospitalDTO) => ({
+    ...item,
+    createdAt: formatISOWithoutTimezone(item.createdAt),
+    updatedAt: formatISOWithoutTimezone(item.updatedAt),
+});
+
+export const HospitalResource = async (res: Response, data: HospitalDTO, message: string = 'Success'): Promise<Response> => {
+    const tags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: data.id,
+            source_type: { in: ['hospital_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    const note_tags = tags
+        .filter(t => t.source_type === 'hospital_notes')
+        .map(t => t.Category?.tag ?? '');
 
-interface HospitalItem {
-    createdAt: string | Date;
-    updatedAt: string | Date;
-    [key: string]: any;
-}
+    const { created_by, ...cleanedData } = data;
 
-export const HospitalResource = (
-    res: Response,
-    data: HospitalItem,
-    message: string = 'Success'
-) => {
-    const formattedData = {
-        ...data,
-        createdAt: formatISOWithoutTimezone(data.createdAt),
-        updatedAt: formatISOWithoutTimezone(data.updatedAt)
+    const formatted = {
+        ...formatItem(cleanedData),
+        note_tags,
     };
 
     return res.status(200).json({
         success: true,
         message,
-        data: formattedData
+        data: formatted,
     });
-};
-
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate");
-
-// const formatItem = ({ item }) => {
-//     const { created_by, ...rest } = item;
-
-//     return {
-//         ...rest,
-//         // user: {
-//         //     id: created_by,
-//         //     name: userName
-//         // },
-//         createdAt: formatISOWithoutTimezone(item.createdAt),
-//         updatedAt: formatISOWithoutTimezone(item.updatedAt)
-//     };
-// };
-
-// exports.HospitalResource = (res, item, message = 'Success') => {
-//     const formattedData = formatItem({ item });
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+};

src/resources/sales/status_history/StatusHistoryCollection.ts

@@ -2,6 +2,7 @@ import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { StatusHistoryDTO } from '../../../types/sales/status_history/StatusHistoryDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: StatusHistoryDTO) => ({
     ...item,
@@ -9,8 +10,46 @@ const formatItem = (item: StatusHistoryDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const StatusHistoryCollection = (req: Request, res: Response, data: StatusHistoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const StatusHistoryCollection = async (req: Request, res: Response, data: StatusHistoryDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['status_history_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { note: string[]; }>();
+    for (const id of ids) {
+        tagMap.set(id, { note: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'status_history_notes') {
+            current.note.push(categoryTag);
+        }
+    }
+
+    // Gabungkan dan format
+    const formattedData = data.map(item => {
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...item,
+            note_tags: tags?.note ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -29,32 +68,4 @@ export const StatusHistoryCollection = (req: Request, res: Response, data: Statu
         limit,
         message,
     });
-};
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-// const { getUserNameById } = require("../../../utils/CheckUserKeycloak.js");
-
-// const transformStatusHistoryList = async (data = []) => {
-//     return Promise.all(data.map(async ({ ...rest }) => {
-//         // const name = await getUserNameById(user_id);
-
-//         return {
-//             ...rest,
-//             // user: {
-//             //     id: user_id,
-//             //     name: name
-//             // },
-//             note: rest.note?.trim() === '' ? null : rest.note,
-//             createdAt: formatISOWithoutTimezone(rest.createdAt),
-//             updatedAt: formatISOWithoutTimezone(rest.updatedAt)
-//         };
-//     }));
-// };
-
-// // Collection yang async
-// exports.StatusHistoryCollection = async ({ req, res, data = [], total = 0, page = 1, limit = 10, message = 'Success' }) => {
-//     const formatted = await transformStatusHistoryList(data);
-
-//     return ListResponse({ req, res, data: formatted, total, page, limit, message });
-// };
+};

src/resources/sales/vendor/VendorCollection.js

@@ -1,22 +0,0 @@
-const { ListResponse } = require("../../../utils/ListResponse");
-const { formatISOWithoutTimezone } = require("../../../utils/FormatDate.js");
-
-const formatItem = (item) => ({
-    ...item,
-    createdAt: formatISOWithoutTimezone(item.createdAt),
-    updatedAt: formatISOWithoutTimezone(item.updatedAt),
-});
-
-exports.VendorCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-    const formattedData = data.map(formatItem);
-
-    if (typeof total !== 'number') {
-        return res.status(200).json({
-            success: true,
-            message,
-            data: Array.isArray(formattedData)
-        });
-    }
-
-    return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-};

src/resources/sales/vendor_experience/VendorExperienceCollection.ts

@@ -1,7 +1,8 @@
 import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
 import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
-import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+import { VendorExperienceDTO } from '../../../types/sales/vendor_experience/VendorExperienceDTO';
+import prisma from '../../../prisma/PrismaClient';
 
 const formatItem = (item: VendorExperienceDTO) => ({
     ...item,
@@ -13,8 +14,57 @@ const formatItem = (item: VendorExperienceDTO) => ({
     updatedAt: formatISOWithoutTimezone(item.updatedAt),
 });
 
-export const VendorExperienceCollection = (req: Request, res: Response, data: VendorExperienceDTO[] = [], total: number | null = null, page: number = 1, limit: number = 10, message: string = 'Success'): Response => {
-    const formattedData = data.map(formatItem);
+export const VendorExperienceCollection = async (
+    req: Request,
+    res: Response,
+    data: VendorExperienceDTO[] = [],
+    total: number | null = null,
+    page: number = 1,
+    limit: number = 10,
+    message: string = 'Success'
+): Promise<Response> => {
+    const ids = data.map(item => item.id);
+
+    // Ambil tags dari category_links yang relevan
+    const allTags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: { in: ids },
+            source_type: { in: ['vendor_experience_positive_notes', 'vendor_experience_negative_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    // Kelompokkan tags berdasarkan source_type dan source_id
+    const tagMap = new Map<string, { positive: string[]; negative: string[] }>();
+    for (const id of ids) {
+        tagMap.set(id, { positive: [], negative: [] });
+    }
+
+    for (const tag of allTags) {
+        const id = tag.source_id!;
+        const categoryTag = tag.Category?.tag ?? '';
+        const current = tagMap.get(id);
+        if (!current) continue;
+
+        if (tag.source_type === 'vendor_experience_positive_notes') {
+            current.positive.push(categoryTag);
+        } else if (tag.source_type === 'vendor_experience_negative_notes') {
+            current.negative.push(categoryTag);
+        }
+    }
+
+    // Gabungkan dan format
+    const formattedData = data.map(item => {
+        const tags = tagMap.get(item.id);
+        return formatItem({
+            ...item,
+            positive_notes_tags: tags?.positive ?? [],
+            negative_notes_tags: tags?.negative ?? [],
+        });
+    });
 
     if (typeof total !== 'number') {
         return res.status(200).json({
@@ -33,29 +83,4 @@ export const VendorExperienceCollection = (req: Request, res: Response, data: Ve
         limit,
         message,
     });
-};
-
-// const { ListResponse } = require("../../../utils/ListResponse");
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate.js");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     contract_date: formatDateOnly(item.contract_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.VendorHistoriCollection = (req, res, data = [], total = null, page = 1, limit = 10, message = 'Success') => {
-//     const formattedData = data.map(formatItem);
-
-//     if (typeof total !== 'number') {
-//         return res.status(200).json({
-//             success: true,
-//             message,
-//             data: Array.isArray(formattedData)
-//         });
-//     }
-
-//     return ListResponse({ req, res, data: formattedData, total, page, limit, message });
-// };
+};

src/resources/sales/vendor_experience/VendorExperienceResource.ts

@@ -1,18 +1,28 @@
 import { Response } from 'express';
 import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
-import { VendorExperienceDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
+import { VendorExperienceDTO } from '../../../types/sales/vendor_experience/VendorExperienceDTO';
+import prisma from '../../../prisma/PrismaClient';
+
+export const VendorExperienceResource = async (res: Response, data: VendorExperienceDTO, message: string = 'Success'): Promise<Response> => {
+    const tags = await prisma.categoryLink.findMany({
+        where: {
+            source_id: data.id,
+            source_type: { in: ['vendor_experience_positive_notes', 'vendor_experience_negative_notes'] },
+            deletedAt: null,
+        },
+        include: {
+            Category: true,
+        },
+    });
+
+    const positive_notes_tags = tags
+        .filter(t => t.source_type === 'vendor_experience_positive_notes')
+        .map(t => t.Category?.tag ?? '');
 
-// const formatItem = (item: VendorExperienceDTO) => ({
-//     ...item,
-//     contract_value_min: item.contract_value_min !== null ? Number(item.contract_value_min) : null,
-//     contract_value_max: item.contract_value_max !== null ? Number(item.contract_value_max) : null,
-//     contract_start_date: formatDateOnly(item.contract_start_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
+    const negative_notes_tags = tags
+        .filter(t => t.source_type === 'vendor_experience_negative_notes')
+        .map(t => t.Category?.tag ?? '');
 
-export const VendorExperienceResource = (res: Response, data: VendorExperienceDTO, message: string = 'Success'): Response => {
     const { vendor_id, ...restData } = data;
 
     const formatted = {
@@ -30,10 +40,10 @@ export const VendorExperienceResource = (res: Response, data: VendorExperienceDT
             : null,
         contract_start_date: formatDateOnly(data.contract_start_date),
         contract_expired_date: formatDateOnly(data.contract_expired_date),
-        // contract_value_min: Number(data.contract_value_min),
-        // contract_value_max: Number(data.contract_value_max),
         contract_value_min: data.contract_value_min !== null ? Number(data.contract_value_min) : null,
         contract_value_max: data.contract_value_max !== null ? Number(data.contract_value_max) : null,
+        positive_notes_tags,
+        negative_notes_tags,
         createdAt: formatISOWithoutTimezone(data.createdAt),
         updatedAt: formatISOWithoutTimezone(data.updatedAt),
     };
@@ -43,24 +53,4 @@ export const VendorExperienceResource = (res: Response, data: VendorExperienceDT
         message,
         data: formatted,
     });
-};
-
-// const { formatISOWithoutTimezone, formatDateOnly } = require("../../../utils/FormatDate");
-
-// const formatItem = (item) => ({
-//     ...item,
-//     contract_date: formatDateOnly(item.contract_date),
-//     contract_expired_date: formatDateOnly(item.contract_expired_date),
-//     createdAt: formatISOWithoutTimezone(item.createdAt),
-//     updatedAt: formatISOWithoutTimezone(item.updatedAt),
-// });
-
-// exports.VendorExperienceResource = (res, data, message = 'Success') => {
-//     const formattedData = formatItem(data);
-
-//     return res.status(200).json({
-//         success: true,
-//         message,
-//         data: formattedData
-//     });
-// };
+};

src/routes/admin/CategoryRoute.ts

@@ -0,0 +1,16 @@
+import express, { Router } from 'express';
+import * as CategoryController from '../../controllers/admin/CategoryController';
+import keycloak from '../../middleware/Keycloak';
+import { extractToken } from '../../middleware/ExtractToken';
+import checkRoles from '../../middleware/CheckRoles';
+const router: Router = express.Router();
+
+router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.getAllCategory);
+router.post('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.storeCategory);
+router.get('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.showCategory);
+router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.updateCategory);
+router.delete('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.deleteCategory);
+
+router.get('/:id/use', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.showUseCategory);
+router.post('/merge', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.mergeCategory);
+export default router;

src/routes/admin/HospitalRoute.ts

@@ -18,82 +18,21 @@ router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])],
 router.delete('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], HospitalController.deleteHospital);
 
 // Vendor Experience
-router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.getAllVendorExperience);
-router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.storeVendorExperience);
-router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.showVendorExperience);
-router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.updateVendorExperience);
-router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.deleteVendorExperience);
+router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], VendorExperienceController.getAllVendorExperience);
+router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], VendorExperienceController.storeVendorExperience);
+router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], VendorExperienceController.showVendorExperience);
+router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], VendorExperienceController.updateVendorExperience);
+router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], VendorExperienceController.deleteVendorExperience);
 
 // Executives History
-router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.getAllExecutivesHistory);
-router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.storeExecutivesHistory);
-router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.showExecutivesHistory);
-router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.updateExecutivesHistory);
-router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.deleteExecutivesHistory);
+router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin"])], ExecutivesHistoryController.getAllExecutivesHistory);
+router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin"])], ExecutivesHistoryController.storeExecutivesHistory);
+router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], ExecutivesHistoryController.showExecutivesHistory);
+router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], ExecutivesHistoryController.updateExecutivesHistory);
+router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], ExecutivesHistoryController.deleteExecutivesHistory);
 
 // Status History
-router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], StatusHistoryController.getAllStatusHistory);
-router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], StatusHistoryController.storeStatusHistory);
+router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], StatusHistoryController.getAllStatusHistory);
+router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], StatusHistoryController.storeStatusHistory);
 
-export default router;
-
-
-// const express = require('express')
-// const router = express.Router()
-// const hospitalController = require('../../controllers/admin/HospitalController.js')
-// const vendorExperienceController = require('../../controllers/admin/VendorExperienceController.js')
-// const executivesHistoryController = require('../../controllers/admin/ExecutivesHistoryController.js')
-// const statusHistoriesController = require('../../controllers/admin/StatusHistoryController.js')
-// const verifyJWT = require('../../middleware/VerifyJWT.js');
-// const checkRole = require('../../middleware/CheckRole.js');
-// const upload = require('../../middleware/UploadImage.js');
-
-// const keycloak = require('../../middleware/Keycloak.js');
-// const extractToken = require('../../middleware/ExtractToken.js');
-// const checkRoles = require('../../middleware/CheckRoles.js');
-
-// router.get('/', verifyJWT, checkRole(['admin']), hospitalController.getAllHospital);
-// router.post('/', verifyJWT, upload.single('image'), checkRole(['admin']), hospitalController.storeHospital);
-// router.get('/:id', verifyJWT, checkRole(['admin']), hospitalController.showHospital);
-// router.patch('/:id', verifyJWT, upload.single('image'), checkRole(['admin']), hospitalController.updateHospital);
-// router.delete('/:id', verifyJWT, checkRole(['admin']), hospitalController.deleteHospital);
-
-// // Vendor History
-// router.get('/:id/vendor-history', verifyJWT, checkRole(['admin']), vendorExperienceController.getAllVendorHistory);
-// router.post('/:id/vendor-history', verifyJWT, checkRole(['admin']), vendorExperienceController.storeVendorHistory);
-// router.get('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorExperienceController.showVendorHistory);
-// router.patch('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorExperienceController.updateVendorHistory);
-// router.delete('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['admin']), vendorExperienceController.deleteVendorHistory);
-
-// // Executives History
-// router.get('/:id/executives-history', verifyJWT, checkRole(['admin']), executivesHistoryController.getAllExecutivesHistory);
-// router.post('/:id/executives-history', verifyJWT, checkRole(['admin']), executivesHistoryController.storeExecutivesHistory);
-// router.get('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.showExecutivesHistory);
-// router.patch('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.updateExecutivesHistory);
-// router.delete('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['admin']), executivesHistoryController.deleteExecutivesHistory);
-
-// router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.getAllHospital);
-// router.post('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], upload.single('image'), hospitalController.storeHospital);
-// router.get('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.showHospital);
-// router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], upload.single('image'), hospitalController.updateHospital);
-// router.delete('/:id', [keycloak.protect(), extractToken, checkRoles(["admin"])], hospitalController.deleteHospital);
-
-// // Vendor History
-// router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], vendorExperienceController.getAllVendorHistory);
-// router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], vendorExperienceController.storeVendorHistory);
-// router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], vendorExperienceController.showVendorHistory);
-// router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], vendorExperienceController.updateVendorHistory);
-// router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin"])], vendorExperienceController.deleteVendorHistory);
-
-// // Executives History
-// router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.getAllExecutivesHistory);
-// router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.storeExecutivesHistory);
-// router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.showExecutivesHistory);
-// router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.updateExecutivesHistory);
-// router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin"])], executivesHistoryController.deleteExecutivesHistory);
-
-// // Status History
-// router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], statusHistoriesController.getAllStatusHistory);
-// router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin"])], statusHistoriesController.storeStatusHistory);
-
-// module.exports = router;
+export default router;

src/routes/sales/HospitalRoute.ts

@@ -17,78 +17,21 @@ router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])],
 router.get('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])], HospitalController.showHospital);
 
 // Vendor Experience
-router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.getAllVendorExperience);
-router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.storeVendorExperience);
-router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.showVendorExperience);
-router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.updateVendorExperience);
-router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], VendorExperienceController.deleteVendorExperience);
+router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["sales"])], VendorExperienceController.getAllVendorExperience);
+router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(["sales"])], VendorExperienceController.storeVendorExperience);
+router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["sales"])], VendorExperienceController.showVendorExperience);
+router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["sales"])], VendorExperienceController.updateVendorExperience);
+router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(["sales"])], VendorExperienceController.deleteVendorExperience);
 
 // Executives History
-router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.getAllExecutivesHistory);
-router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.storeExecutivesHistory);
-router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.showExecutivesHistory);
-router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.updateExecutivesHistory);
-router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], ExecutivesHistoryController.deleteExecutivesHistory);
+router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], ExecutivesHistoryController.getAllExecutivesHistory);
+router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], ExecutivesHistoryController.storeExecutivesHistory);
+router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["sales"])], ExecutivesHistoryController.showExecutivesHistory);
+router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["sales"])], ExecutivesHistoryController.updateExecutivesHistory);
+router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(["sales"])], ExecutivesHistoryController.deleteExecutivesHistory);
 
 // // Status History
-router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], StatusHistoryController.getAllStatusHistory);
-router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], StatusHistoryController.storeStatusHistory);
+router.get('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["sales"])], StatusHistoryController.getAllStatusHistory);
+router.post('/:id/status-histories', [keycloak.protect(), extractToken, checkRoles(["sales"])], StatusHistoryController.storeStatusHistory);
 
-export default router;
-
-// const express = require('express')
-// const router = express.Router()
-// const hospitalController = require('../../controllers/sales/HospitalController.js')
-// const vendorExperienceController = require('../../controllers/sales/VendorExperienceController.js')
-// const executivesHistoryController = require('../../controllers/sales/ExecutivesHistoryController.js')
-// const statusHistoriesController = require('../../controllers/sales/StatusHistoryController.js')
-// const verifyJWT = require('../../middleware/VerifyJWT.js');
-// const checkRole = require('../../middleware/CheckRole.js');
-// const upload = require('../../middleware/UploadImage.js');
-
-// const keycloak = require('../../middleware/Keycloak.js');
-// const extractToken = require('../../middleware/ExtractToken.js');
-// const checkRoles = require('../../middleware/CheckRoles.js');
-
-// router.get('/', verifyJWT, checkRole(['sales']), hospitalController.getAllHospitalByArea);
-// router.post('/', verifyJWT, upload.single('image'), checkRole(['sales']), hospitalController.storeHospital);
-// router.patch('/:id', verifyJWT, upload.single('image'), checkRole(['sales']), hospitalController.updateHospital);
-// router.get('/:id', verifyJWT, checkRole(['sales']), hospitalController.showHospital);
-
-// // Vendor History
-// router.get('/:id/vendor-history', verifyJWT, checkRole(['sales']), vendorHistoryController.getAllVendorHistory);
-// router.post('/:id/vendor-history', verifyJWT, checkRole(['sales']), vendorHistoryController.storeVendorHistory);
-// router.get('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.showVendorHistory);
-// router.patch('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.updateVendorHistory);
-// router.delete('/:id/vendor-history/:id_vendor_history', verifyJWT, checkRole(['sales']), vendorHistoryController.deleteVendorHistory);
-
-// // Executives History
-// router.get('/:id/executives-history', verifyJWT, checkRole(['sales']), executivesHistoryController.getAllExecutivesHistory);
-// router.post('/:id/executives-history', verifyJWT, checkRole(['sales']), executivesHistoryController.storeExecutivesHistory);
-// router.get('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.showExecutivesHistory);
-// router.patch('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.updateExecutivesHistory);
-// router.delete('/:id/executives-history/:id_executives_history', verifyJWT, checkRole(['sales']), executivesHistoryController.deleteExecutivesHistory);
-
-// router.get('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], hospitalController.getAllHospitalByArea);
-// router.post('/', [keycloak.protect(), extractToken, checkRoles(['sales'])], upload.single('image'), hospitalController.storeHospital);
-// router.patch('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])], upload.single('image'), hospitalController.updateHospital);
-// router.get('/:id', [keycloak.protect(), extractToken, checkRoles(['sales'])], hospitalController.showHospital);
-
-// // Vendor History
-// router.get('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.getAllVendorHistory);
-// router.post('/:id/vendor-experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.storeVendorHistory);
-// router.get('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.showVendorHistory);
-// router.patch('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.updateVendorHistory);
-// router.delete('/:id/vendor-experience/:id_vendor_experience', [keycloak.protect(), extractToken, checkRoles(['sales'])], vendorExperienceController.deleteVendorHistory);
-
-// // Executives History
-// router.get('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.getAllExecutivesHistory);
-// router.post('/:id/executives-history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.storeExecutivesHistory);
-// router.get('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.showExecutivesHistory);
-// router.patch('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.updateExecutivesHistory);
-// router.delete('/:id/executives-history/:id_executives_history', [keycloak.protect(), extractToken, checkRoles(['sales'])], executivesHistoryController.deleteExecutivesHistory);
-
-// router.get('/:id/status-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], statusHistoriesController.getAllStatusHistory);
-// router.post('/:id/status-history', [keycloak.protect(), extractToken, checkRoles(["sales"])], statusHistoriesController.storeStatusHistory);
-
-// module.exports = router;
+export default router;

src/services/admin/CategoryLinkService.ts

@@ -0,0 +1,60 @@
+import CategoryRepository from '../../repository/admin/CategoryRepository';
+import CategoryLinkRepository from '../../repository/admin/CategoryLinkRepository';
+import { createLog, updateLog } from '../../utils/LogActivity';
+import { CustomRequest } from '../../types/token/CustomRequest';
+
+export const storeCategoryLinkService = async (tags: string[], source_type: string, source_id: string, req: CustomRequest) => {
+    const result = [];
+
+    for (let i = 0; i < tags.length; i++) {
+        const tag = tags[i];
+
+        const existCategoryTag = await CategoryRepository.findByTag(tag);
+
+        let categoryId: string = "";
+        if (!existCategoryTag) {
+            const created = await CategoryRepository.create({ tag: tag, description: null });
+            categoryId = created.id;
+            await createLog(req, created);
+        } else {
+            categoryId = existCategoryTag.id;
+        }
+
+        const data = await CategoryLinkRepository.create({
+            category_id: categoryId,
+            source_type: source_type,
+            source_id: source_id,
+        });
+
+        await createLog(req, data);
+        result.push(data);
+    }
+};
+export const updateCategoryLinkService = async (newTags: string[], source_type: string, source_id: string, req: CustomRequest) => {
+    const result = [];
+
+    const oldLinks = await CategoryLinkRepository.findBySource(source_type, source_id);
+
+    for (const link of oldLinks) {
+        await CategoryLinkRepository.deleteById(link.id);
+    }
+
+    for (const tag of newTags) {
+        let category = await CategoryRepository.findByTag(tag);
+        if (!category) {
+            category = await CategoryRepository.create({ tag, description: null });
+            await createLog(req, category);
+        }
+
+        const newLink = await CategoryLinkRepository.create({
+            category_id: category.id,
+            source_type,
+            source_id,
+        });
+
+        await updateLog(req, newLink);
+        result.push(newLink);
+    }
+
+    return result;
+};

src/services/admin/CategoryService.ts

@@ -0,0 +1,203 @@
+import CategoryRepository from '../../repository/admin/CategoryRepository';
+import { HttpException } from '../../utils/HttpException';
+import { createLog, updateLog, deleteLog } from '../../utils/LogActivity';
+import { SearchFilter } from '../../utils/SearchFilter';
+import { now } from '../../utils/TimeLocal';
+import { Prisma } from '@prisma/client';
+import { CustomRequest } from '../../types/token/CustomRequest';
+import { CategoryRequestDTO, MergeCategoryRequestDTO } from '../../types/admin/category/CategoryDTO';
+import prisma from '../../prisma/PrismaClient';
+import { GetSourceDataByType } from '../../utils/GetSourceDataByType';
+import { TransformCategoryLinkUse } from '../../resources/admin/category/TransformCategoryLinkUse';
+import { CategoryLinkUseDTO } from '../../types/admin/category_link/CategoryLinkDTO';
+
+interface GetAllCategoryParams {
+    page: number;
+    limit: number;
+    search?: string;
+    sortBy: string;
+    orderBy: 'asc' | 'desc';
+}
+
+interface GetAllCategoryLinkParams {
+    page: number;
+    limit: number;
+    search?: string;
+    categoryId: string;
+}
+
+export const getAllCategoryService = async ({ page, limit, search, sortBy, orderBy }: GetAllCategoryParams) => {
+    const skip = (page - 1) * limit;
+
+    const where: Prisma.CategoryWhereInput = {
+        ...SearchFilter(search, ['tag']),
+        deletedAt: null,
+    };
+
+    const [categories, total] = await Promise.all([
+        CategoryRepository.findAll({
+            skip,
+            take: limit,
+            where,
+            orderBy: { [sortBy]: orderBy },
+        }),
+        CategoryRepository.countAll(where),
+    ]);
+
+    return { categories, total };
+};
+
+export const showCategoryService = async (id: string) => {
+    const category = await CategoryRepository.findById(id);
+    if (!category) {
+        throw new HttpException('Data category not found', 404);
+    }
+
+    return category;
+};
+
+export const storeCategoryService = async (validateData: CategoryRequestDTO, req: CustomRequest) => {
+    const existingCategory = await CategoryRepository.findByTag(validateData.tag);
+    if (existingCategory && !existingCategory.deletedAt) {
+        throw new HttpException('Category with this tag already exists and may not be duplicated.', 400);
+    }
+
+    const data = await CategoryRepository.create(validateData);
+    await createLog(req, data);
+    return data;
+};
+
+export const updateCategoryService = async (validateData: CategoryRequestDTO, id: string, req: CustomRequest) => {
+    const category = await CategoryRepository.findById(id);
+    if (!category) {
+        throw new HttpException('Data category not found', 404);
+    }
+
+    if (validateData.tag) {
+        const existingCategory = await CategoryRepository.findByTag(validateData.tag);
+        if (existingCategory && existingCategory.id !== id) {
+            throw new HttpException('Category with this tag already exists and may not be duplicated.', 400);
+        }
+    }
+
+    const data = await CategoryRepository.update(id, validateData);
+    await updateLog(req, data);
+    return data;
+};
+
+export const deleteCategoryService = async (id: string, req: CustomRequest) => {
+    const category = await CategoryRepository.findById(id);
+    if (!category) {
+        throw new HttpException('Data category not found', 404);
+    }
+
+    const data = await CategoryRepository.update(id, {
+        deletedAt: now().toDate(),
+    });
+
+    await deleteLog(req, data);
+    return data;
+};
+
+export const showUseCategoryService = async ({ page, limit, search, categoryId }: GetAllCategoryLinkParams) => {
+    const skip = (page - 1) * limit;
+
+    const where: Prisma.CategoryLinkWhereInput = {
+        ...SearchFilter(search, ['source_type']),
+        category_id: categoryId,
+        deletedAt: null,
+    };
+
+    const [links, total] = await Promise.all([
+        CategoryRepository.findAllCategoryLink({ skip, take: limit, where }),
+        CategoryRepository.countAllCategoryLink(where),
+    ]);
+
+    const result: CategoryLinkUseDTO[] = [];
+
+    for (const link of links) {
+        const { source_id, source_type } = link;
+        if (!source_id || !source_type) continue;
+
+        const sourceData = await GetSourceDataByType(source_type, source_id);
+        if (!sourceData) continue;
+
+        result.push(TransformCategoryLinkUse(link, source_type, sourceData));
+    }
+
+    return { data: result, total, page, limit };
+};
+
+export const mergeCategoryService = async (validateData: MergeCategoryRequestDTO, req: CustomRequest) => {
+    // Soft delete old categories
+    for (const id of validateData.category_id) {
+        const category = await CategoryRepository.findById(id);
+        if (!category) {
+            throw new HttpException(`Category with tag ${validateData.tag} not found`, 404);
+        }
+    }
+
+    // Check tag uniqueness
+    const existingCategory = await CategoryRepository.findByTag(validateData.tag);
+    if (existingCategory && !existingCategory.deletedAt) {
+        throw new HttpException('Category with this tag already exists and may not be duplicated.', 400);
+    }
+
+    // Create new merged category
+    const data = await CategoryRepository.create({
+        tag: validateData.tag,
+        description: validateData.description ?? null,
+    });
+
+    await createLog(req, data);
+
+    await prisma.categoryLink.updateMany({
+        where: {
+            category_id: { in: validateData.category_id },
+            deletedAt: null,
+        },
+        data: {
+            category_id: data.id,
+        },
+    });
+
+    await prisma.category.updateMany({
+        where: {
+            id: { in: validateData.category_id },
+            deletedAt: null,
+        },
+        data: {
+            deletedAt: now().toDate(),
+        },
+    });
+
+    // Remove duplicate category links (same category_id, source_type, source_id, deletedAt: null)
+    const links = await prisma.categoryLink.findMany({
+        where: {
+            category_id: data.id,
+            deletedAt: null,
+        },
+    });
+
+    // Group by source_type + source_id
+    const grouped: Record<string, typeof links> = {};
+    for (const link of links) {
+        const key = `${link.source_type}_${link.source_id}`;
+        if (!grouped[key]) grouped[key] = [];
+        grouped[key].push(link);
+    }
+
+    for (const group of Object.values(grouped)) {
+        if (group.length > 1) {
+            // Sort by createdAt, keep the earliest, delete the rest
+            const sorted = group.sort((a, b) => a.createdAt.getTime() - b.createdAt.getTime());
+            const toDelete = sorted.slice(1);
+            for (const link of toDelete) {
+                await prisma.categoryLink.update({
+                    where: { id: link.id },
+                    data: { deletedAt: now().toDate() },
+                });
+            }
+        }
+    }
+};

src/services/admin/HospitalService.ts

@@ -6,12 +6,13 @@ import { createLog, updateLog, deleteLog } from '../../utils/LogActivity';
 import ProvinceRepository from '../../repository/admin/ProvinceRepository';
 import CityRepository from '../../repository/admin/CityRepository';
 import prisma from '../../prisma/PrismaClient';
-import { ProgressStatus } from '@prisma/client';
+import { Prisma, ProgressStatus } from '@prisma/client';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { HospitalRequestDTO } from '../../types/admin/hospital/HospitalDTO';
 import path from 'path';
 import fs from 'fs/promises';
 import sharp from 'sharp';
+import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -79,11 +80,6 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
         );
     }
 
-    // Cek file image
-    // if (!req.file) {
-    //     throw new HttpException({ image: ['image file is required'] }, 422);
-    // }
-
     // Cek duplikasi rumah sakit (yang belum terhapus)
     const existingHospital = await prisma.hospital.findFirst({
         where: {
@@ -97,22 +93,7 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
         throw new HttpException('Hospital with same name in this city already exists', 400);
     }
 
-    // const imagePath = `/storage/img/${req.file.filename}`;
-
     let imagePath: string | null = null;
-    // if (req.file) {
-    //     imagePath = `/storage/img/${req.file.filename}`;
-    // }
-
-    // if (req.file) {
-    //     const ext = path.extname(req.file.originalname);
-    //     const filename = `${Date.now()}-${Math.round(Math.random() * 1e9)}${ext}`;
-    //     const fullPath = path.join(__dirname, '../../../storage/img', filename);
-
-    //     await fs.promises.writeFile(fullPath, req.file.buffer);
-
-    //     imagePath = `/storage/img/${filename}`;
-    // }
 
     if (req.file) {
         const ext = '.jpg';
@@ -163,7 +144,6 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
         throw new HttpException("Either gmaps_url or coordinates must be provided", 400);
     }
 
-    // Payload untuk membuat hospital
     const payload = {
         name: validateData.name!,
         hospital_code: validateData.hospital_code,
@@ -171,12 +151,12 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
         ownership: validateData.ownership,
         address: validateData.address,
         contact: validateData.contact,
-        note: validateData.note,
         image: imagePath,
         latitude,
         longitude,
         gmaps_url: gmapsUrl,
         progress_status: ProgressStatus.cari_data,
+        note: validateData.note ?? '',
         province: {
             connect: { id: validateData.province_id! },
         },
@@ -189,12 +169,19 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
     };
 
     const data = await HospitalRepository.create(payload);
-    await createLog(req, data);
+    if (validateData.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.tags,
+            'hospital_notes',
+            data.id,
+            req
+        );
+    }
 
-    return data;
+    await createLog(req, data);
 };
 
-export const updateHospitalService = async (validateData: HospitalRequestDTO, id: string, req: CustomRequest) => {
+export const updateHospitalService = async (validateData: Partial<HospitalRequestDTO>, id: string, req: CustomRequest) => {
     const hospital = await HospitalRepository.findById(id);
     if (!hospital) throw new HttpException("Hospital data not found", 404);
 
@@ -231,16 +218,6 @@ export const updateHospitalService = async (validateData: HospitalRequestDTO, id
     }
 
     let imagePath = hospital.image;
-    // if (req.file) imagePath = `/storage/img/${req.file.filename}`;
-    // if (req.file) {
-    //     const ext = path.extname(req.file.originalname);
-    //     const filename = `${Date.now()}-${Math.round(Math.random() * 1e9)}${ext}`;
-    //     const fullPath = path.join(__dirname, '../../../storage/img', filename);
-
-    //     await fs.promises.writeFile(fullPath, req.file.buffer);
-
-    //     imagePath = `/storage/img/${filename}`;
-    // }
 
     if (req.file) {
         const ext = '.jpg';
@@ -293,16 +270,41 @@ export const updateHospitalService = async (validateData: HospitalRequestDTO, id
         }
     }
 
-    const payload = {
-        ...validateData,
-        image: imagePath,
-        latitude,
-        longitude,
-        gmaps_url: gmapsUrl,
-        progress_status: validateData.progress_status as ProgressStatus,
+    // Final payload
+    const payload: Prisma.HospitalUpdateInput = {
+        ...(validateData.name && { name: validateData.name }),
+        ...(validateData.hospital_code && { hospital_code: validateData.hospital_code }),
+        ...(validateData.type && { type: validateData.type }),
+        ...(validateData.ownership && { ownership: validateData.ownership }),
+        ...(validateData.address && { address: validateData.address }),
+        ...(validateData.contact && { contact: validateData.contact }),
+        ...(validateData.note !== undefined && { note: validateData.note }),
+        ...(validateData.progress_status && { progress_status: validateData.progress_status }),
+        ...(imagePath && { image: imagePath }),
+        ...(latitude !== undefined && { latitude }),
+        ...(longitude !== undefined && { longitude }),
+        ...(gmapsUrl !== undefined && { gmaps_url: gmapsUrl }),
+        ...(validateData.province_id && {
+            province: {
+                connect: { id: validateData.province_id }
+            }
+        }),
+        ...(validateData.city_id && {
+            city: {
+                connect: { id: validateData.city_id }
+            }
+        }),
     };
 
     const data = await HospitalRepository.update(id, payload);
+    if (validateData.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.tags,
+            'hospital_notes',
+            id,
+            req
+        );
+    }
     await updateLog(req, data);
 };
 

src/services/admin/StatusHistoryService.ts

@@ -5,6 +5,7 @@ import { createLog } from '../../utils/LogActivity';
 import StatusHistoryRepository from '../../repository/admin/StatusHistoryRepository';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { StatusHistoryRequestDTO } from '../../types/admin/status_history/StatusHistoryDTO';
+import { storeCategoryLinkService } from './CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -84,7 +85,7 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         },
         old_status: hospital.progress_status,
         new_status: validateData.new_status as ProgressStatus,
-        note: validateData.note,
+        note: validateData.note?.note,
     };
 
     const data = await StatusHistoryRepository.create(payload);
@@ -94,82 +95,14 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         data: { progress_status: validateData.new_status as ProgressStatus },
     });
 
-    await createLog(req, data);
-};
+    if (validateData.note?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.note.tags,
+            'status_history_notes',
+            data.id,
+            req
+        );
+    }
 
-// const HttpException = require('../../utils/HttpException.js');
-// const prisma = require('../../prisma/PrismaClient.js');
-// const { createLog } = require('../../utils/LogActivity.js');
-// const StatusHistoryRepository = require('../../repository/admin/StatusHistoryRepository.js');
-
-// exports.getAllStatusHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
-//     const skip = (page - 1) * limit;
-
-//     const hospitalId = req.params.id;
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const where = {
-//         hospital_id: req.params.id,
-//         deletedAt: null
-//     };
-
-//     const [status_histories, total] = await Promise.all([
-//         StatusHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         StatusHistoryRepository.countAll(where)
-//     ]);
-
-//     return { status_histories, total };
-// };
-
-// const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up', 'mou', 'onboarded', 'tidak_berminat'];
-
-// exports.storeStatusHistoryService = async (validateData, req) => {
-//     const hospitalId = req.params.id;
-//     const userId = req.tokenData.sub;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     if (validateData.new_status && !validProgressStatuses.includes(validateData.new_status)) {
-//         throw new HttpException(
-//             `Invalid new_status. Allowed values are: ${validProgressStatuses.join(', ')}`,
-//             422
-//         );
-//     }
-
-//     if (validateData.new_status === hospital.progress_status) {
-//         throw new HttpException("New status change is the same as old status", 400)
-//     }
-
-//     const payload = {
-//         hospital_id: hospitalId,
-//         user_id: userId,
-//         old_status: hospital.progress_status,
-//         new_status: validateData.new_status,
-//         note: validateData.note,
-//     };
-
-//     const data = await StatusHistoryRepository.create(payload);
-
-//     await prisma.hospital.update({
-//         where: { id: hospitalId },
-//         data: {
-//             progress_status: validateData.new_status
-//         }
-//     });
-
-//     await createLog(req, data);
-// };
+    await createLog(req, data);
+};

src/services/admin/VendorExperienceService.ts

@@ -6,6 +6,7 @@ import { createLog, updateLog, deleteLog } from '../../utils/LogActivity';
 import VendorExperienceRepository from '../../repository/admin/VendorExperienceRepository';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { VendorExperienceRequestDTO } from '../../types/admin/vendor_experience/VendorExperienceDTO';
+import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -113,14 +114,33 @@ export const storeVendorExperienceService = async (validateData: VendorExperienc
         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : null,
         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : null,
         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : null,
-        positive_notes: validateData.positive_notes,
-        negative_notes: validateData.negative_notes,
+        positive_notes: validateData.positive_notes?.note,
+        negative_notes: validateData.negative_notes?.note,
         hospital: {
             connect: { id: hospitalId }
         },
     };
 
     const data = await VendorExperienceRepository.create(payload);
+
+    // Setelah data berhasil disimpan
+    if (validateData.positive_notes?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.positive_notes.tags,
+            'vendor_experience_positive_notes',
+            data.id,
+            req
+        );
+    }
+
+    if (validateData.negative_notes?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.negative_notes.tags,
+            'vendor_experience_negative_notes',
+            data.id,
+            req
+        );
+    }
     await createLog(req, data);
 };
 
@@ -167,21 +187,21 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
     ) {
         throw new HttpException('Contract value min must be less than contract value max.', 400);
     }
-    
+
     if (
         validateData.contract_value_max &&
         validateData.contract_value_max <= vendorHistory.contract_value_min!
     ) {
         throw new HttpException('Contract value max must be greater than contract value min.', 400);
     }
-    
+
     if (
         validateData.contract_start_date &&
         validateData.contract_start_date >= vendorHistory.contract_expired_date!
     ) {
         throw new HttpException('Contract start date must be before contract expired date.', 400);
     }
-    
+
     if (
         validateData.contract_expired_date &&
         validateData.contract_expired_date <= vendorHistory.contract_start_date!
@@ -221,14 +241,34 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : vendorHistory.contract_value_min,
         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : vendorHistory.contract_value_max,
-        positive_notes: validateData.positive_notes,
-        negative_notes: validateData.negative_notes,
+        positive_notes: validateData.positive_notes?.note || vendorHistory.positive_notes,
+        negative_notes: validateData.negative_notes?.note || vendorHistory.negative_notes,
         simrs_type: validateData.simrs_type,
         vendor_id: validateData.vendor_id
     };
 
     const data = await VendorExperienceRepository.update(id_vendor_experience, payload);
     await updateLog(req, data);
+
+    // Positive Notes Tags
+    if (validateData.positive_notes?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.positive_notes.tags,
+            'vendor_experience_positive_notes',
+            id_vendor_experience,
+            req
+        );
+    }
+
+    // Negative Notes Tags
+    if (validateData.negative_notes?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.negative_notes.tags,
+            'vendor_experience_negative_notes',
+            id_vendor_experience,
+            req
+        );
+    }
 };
 
 export const deleteVendorExperienceService = async (req: CustomRequest) => {

src/services/admin/VendorService.ts

@@ -7,6 +7,7 @@ import { Request } from 'express';
 import { Prisma } from '@prisma/client';
 import { VendorRequestDTO } from '../../types/admin/vendor/VendorDTO';
 import { CustomRequest } from '../../types/token/CustomRequest';
+import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -68,15 +69,38 @@ export const storeVendorService = async (validateData: VendorRequestDTO, req: Cu
                 id: creatorId,
             },
         },
+        strengths: validateData.strengths?.note,
+        weaknesses: validateData.weaknesses?.note,
     };
 
 
     const data = await VendorRepository.create(payload);
     await createLog(req, data);
+    // Setelah data berhasil disimpan
+    if (validateData.strengths?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.strengths.tags,
+            'vendor_strength_notes',
+            data.id,
+            req
+        );
+    }
+
+    if (validateData.weaknesses?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.weaknesses.tags,
+            'vendor_weaknesses_notes',
+            data.id,
+            req
+        );
+    }
+    await createLog(req, data);
 };
 
-export const updateVendorService = async (validateData: Partial<VendorRequestDTO>, id: string, req: CustomRequest) => {
-    const vendor = await VendorRepository.findById(id);
+export const updateVendorService = async (validateData: Partial<VendorRequestDTO>, req: CustomRequest) => {
+    const id_vendor: string = req.params.id;
+
+    const vendor = await VendorRepository.findById(id_vendor);
     if (!vendor) {
         throw new HttpException('Data vendor not found', 404);
     }
@@ -94,12 +118,33 @@ export const updateVendorService = async (validateData: Partial<VendorRequestDTO
         }
     }
 
-    const payload: Partial<VendorRequestDTO> = {
-        ...validateData
+    const payload: Prisma.VendorUpdateInput = {
+        ...validateData,
+        strengths: validateData.strengths?.note ?? vendor.strengths,
+        weaknesses: validateData.weaknesses?.note ?? vendor.weaknesses,
     };
 
-    const data = await VendorRepository.update(id, payload);
+    const data = await VendorRepository.update(id_vendor, payload);
     await updateLog(req, data);
+
+
+    if (validateData.strengths?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.strengths.tags,
+            'vendor_strength_notes',
+            id_vendor,
+            req
+        );
+    }
+
+    if (validateData.weaknesses?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.weaknesses.tags,
+            'vendor_weaknesses_notes',
+            id_vendor,
+            req
+        );
+    }
 };
 
 export const deleteVendorService = async (id: string, req: CustomRequest) => {

src/services/sales/HospitalService.ts

@@ -1,4 +1,4 @@
-import { PrismaClient, ProgressStatus } from '@prisma/client';
+import { Prisma, PrismaClient, ProgressStatus } from '@prisma/client';
 import { SearchFilter } from '../../utils/SearchFilter';
 import { createLog, updateLog } from '../../utils/LogActivity';
 import { HttpException } from '../../utils/HttpException';
@@ -9,9 +9,9 @@ import HospitalRepository from '../../repository/admin/HospitalRepository';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { HospitalRequestDTO } from '../../types/sales/hospital/HospitalDTO';
 import path from 'path';
-// import fs from 'fs';
 import fs from 'fs/promises';
 import sharp from 'sharp';
+import { storeCategoryLinkService, updateCategoryLinkService } from '../admin/CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -81,23 +81,7 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
     });
     if (existingHospital) throw new HttpException('Hospital with same name in this city already exists', 400);
 
-    // if (!req.file) throw new HttpException({ image: ['image file is required'] }, 422);
-    // const imagePath = `/storage/img/${req.file.filename}`;
-
     let imagePath: string | null = null;
-    // if (req.file) {
-    //     imagePath = `/storage/img/${req.file.filename}`;
-    // }
-
-    // if (req.file) {
-    //     const ext = path.extname(req.file.originalname);
-    //     const filename = `${Date.now()}-${Math.round(Math.random() * 1e9)}${ext}`;
-    //     const fullPath = path.join(__dirname, '../../../storage/img', filename);
-
-    //     await fs.promises.writeFile(fullPath, req.file.buffer);
-
-    //     imagePath = `/storage/img/${filename}`;
-    // }
 
     if (req.file) {
         const ext = '.jpg';
@@ -166,10 +150,18 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
     };
 
     const data = await salesHospitalRepository.create(payload);
+    if (validateData.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.tags,
+            'hospital_notes',
+            data.id,
+            req
+        );
+    }
     await createLog(req, data);
 };
 
-export const updateHospitalService = async (validateData: HospitalRequestDTO, id: string, req: CustomRequest) => {
+export const updateHospitalService = async (validateData: Partial<HospitalRequestDTO>, id: string, req: CustomRequest) => {
     const hospital = await HospitalRepository.findById(id);
     if (!hospital) throw new HttpException('Hospital data not found', 404);
 
@@ -224,16 +216,6 @@ export const updateHospitalService = async (validateData: HospitalRequestDTO, id
     }
 
     let imagePath = hospital.image;
-    // if (req.file) imagePath = `/storage/img/${req.file.filename}`;
-    // if (req.file) {
-    //     const ext = path.extname(req.file.originalname);
-    //     const filename = `${Date.now()}-${Math.round(Math.random() * 1e9)}${ext}`;
-    //     const fullPath = path.join(__dirname, '../../../storage/img', filename);
-
-    //     await fs.promises.writeFile(fullPath, req.file.buffer);
-
-    //     imagePath = `/storage/img/${filename}`;
-    // }
 
     if (req.file) {
         const ext = '.jpg';
@@ -287,16 +269,40 @@ export const updateHospitalService = async (validateData: HospitalRequestDTO, id
         }
     }
 
-    const payload = {
-        ...validateData,
-        image: imagePath,
-        latitude,
-        longitude,
-        gmaps_url: gmapsUrl,
-        progress_status: validateData.progress_status as ProgressStatus,
+    const payload: Prisma.HospitalUpdateInput = {
+        ...(validateData.name && { name: validateData.name }),
+        ...(validateData.hospital_code && { hospital_code: validateData.hospital_code }),
+        ...(validateData.type && { type: validateData.type }),
+        ...(validateData.ownership && { ownership: validateData.ownership }),
+        ...(validateData.address && { address: validateData.address }),
+        ...(validateData.contact && { contact: validateData.contact }),
+        ...(validateData.note !== undefined && { note: validateData.note }),
+        ...(validateData.progress_status && { progress_status: validateData.progress_status }),
+        ...(imagePath && { image: imagePath }),
+        ...(latitude !== undefined && { latitude }),
+        ...(longitude !== undefined && { longitude }),
+        ...(gmapsUrl !== undefined && { gmaps_url: gmapsUrl }),
+        ...(validateData.province_id && {
+            province: {
+                connect: { id: validateData.province_id }
+            }
+        }),
+        ...(validateData.city_id && {
+            city: {
+                connect: { id: validateData.city_id }
+            }
+        }),
     };
 
     const data = await salesHospitalRepository.update(id, payload);
+    if (validateData.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.tags,
+            'hospital_notes',
+            id,
+            req
+        );
+    }
     await updateLog(req, data);
 };
 
@@ -322,256 +328,4 @@ export const showHospitalService = async (id: string, req: CustomRequest) => {
     }
 
     return { hospital };
-};
-
-// const salesHospitalRepository = require('../../repository/sales/HospitalRepository.js');
-// const { SearchFilter } = require('../../utils/SearchFilter.js');
-// const prisma = require('../../prisma/PrismaClient.js');
-// const { createLog, updateLog } = require('../../utils/LogActivity.js');
-// const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js');
-// const CityRepository = require('../../repository/admin/CityRepository.js');
-// const HttpException = require('../../utils/HttpException.js');
-// const HospitalRepository = require('../../repository/admin/HospitalRepository.js');
-// const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
-// const { getUserNameById } = require('../../utils/CheckUserKeycloak.js');
-
-// exports.getAllHospitalByAreaService = async ({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req) => {
-//     const skip = (page - 1) * limit;
-
-//     const userAreas = await prisma.userArea.findMany({
-//         where: { user_id: req.tokenData.sub },
-//         select: { province_id: true },
-//     });
-
-//     const provinceIds = userAreas.map(ua => ua.province_id);
-
-//     const where = {
-//         ...SearchFilter(search, ['name', 'province.id', 'city.id', 'type', 'ownership']),
-//         province_id: { in: provinceIds },
-//         ...(province ? { province_id: province } : {}),
-//         ...(city ? { city_id: city } : {}),
-//         ...(type ? { type: type } : {}),
-//         ...(ownership ? { ownership: ownership } : {}),
-//         ...(progress_status ? { progress_status: progress_status } : {}),
-//         deletedAt: null
-//     };
-
-//     const [hospitals, total] = await Promise.all([
-//         salesHospitalRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         salesHospitalRepository.countAll(where)
-//     ]);
-
-//     return { hospitals, total };
-// };
-
-// exports.storeHospitalService = async (validateData, req) => {
-//     const creatorId = req.tokenData.sub;
-
-//     const province = await ProvinceRepository.findById(validateData.province_id);
-//     if (!province) {
-//         throw new HttpException('Province not found', 404);
-//     }
-
-//     const userArea = await prisma.userArea.findFirst({
-//         where: {
-//             user_id: req.tokenData.sub,
-//             province_id: validateData.province_id
-//         }
-//     });
-
-//     if (!userArea) {
-//         throw new HttpException('You are not allowed to add hospital to this province', 403);
-//     }
-
-//     const city = await CityRepository.findById(validateData.city_id);
-//     if (!city) {
-//         throw new HttpException('City not found', 404);
-//     }
-
-//     const existingHospital = await prisma.hospital.findFirst({
-//         where: {
-//             name: validateData.name,
-//             city_id: validateData.city_id,
-//             deletedAt: null
-//         }
-//     });
-
-//     if (existingHospital) {
-//         throw new HttpException('Hospital with same name in this city already exists', 400);
-//     }
-
-//     if (!req.file) {
-//         throw new HttpException({ image: ['image file is required'] }, 422);
-//     }
-
-//     const imagePath = req.file ? `/storage/img/${req.file.filename}` : null;
-
-//     let latitude = validateData.latitude ?? null;
-//     let longitude = validateData.longitude ?? null;
-//     let gmapsUrl = validateData.gmaps_url ?? null;
-
-//     if (gmapsUrl) {
-//         if (gmapsUrl.includes("www.google.com/maps")) {
-//             const regex = /@(-?\d+\.\d+),(-?\d+\.\d+)/;
-//             const match = gmapsUrl.match(regex);
-
-//             if (match) {
-//                 latitude = parseFloat(match[1]);
-//                 longitude = parseFloat(match[2]);
-//             } else {
-//                 throw new HttpException("Unable to extract coordinates from gmaps_url", 400);
-//             }
-
-//         } else if (gmapsUrl.includes("maps.app.goo.gl")) {
-//             latitude = null;
-//             longitude = null;
-
-//         } else {
-//             // URL disediakan tapi bukan dari domain yang valid
-//             throw new HttpException("gmaps_url must be a valid Google Maps URL", 400);
-//         }
-//     } else if (latitude !== null && longitude !== null) {
-//         gmapsUrl = null;
-//     } else {
-//         throw new HttpException("Either gmaps_url or coordinates must be provided", 400);
-//     }
-
-//     const payload = {
-//         ...validateData,
-//         image: imagePath,
-//         progress_status: "cari_data",
-//         // simrs_type: "-",
-//         created_by: creatorId,
-//         latitude,
-//         longitude,
-//         gmaps_url: gmapsUrl,
-//     };
-
-//     const data = await salesHospitalRepository.create(payload);
-//     await createLog(req, data);
-// };
-
-// const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up', 'mou', 'onboarded', 'tidak_berminat'];
-
-// exports.updateHospitalService = async (validateData, id, req) => {
-//     const hospital = await HospitalRepository.findById(id);
-//     if (!hospital) {
-//         throw new HttpException("Hospital data not found", 404);
-//     }
-
-//     const userArea = await prisma.userArea.findFirst({
-//         where: {
-//             user_id: req.tokenData.sub,
-//             province_id: validateData.province_id
-//         }
-//     });
-
-//     if (!userArea) {
-//         throw new HttpException("You are not authorized to update hospital in this province", 403);
-//     }
-
-//     if (validateData.province_id) {
-//         const province = await ProvinceRepository.findById(validateData.province_id);
-//         if (!province) {
-//             throw new HttpException('Province not found', 404);
-//         }
-//     }
-
-//     if (validateData.city_id) {
-//         const city = await CityRepository.findById(validateData.city_id);
-//         if (!city) {
-//             throw new HttpException('City not found', 404);
-//         }
-//     }
-
-//     if (validateData.progress_status && !validProgressStatuses.includes(validateData.progress_status)) {
-//         throw new HttpException(
-//             `Invalid progress_status. Allowed values are: ${validProgressStatuses.join(', ')}`,
-//             422
-//         );
-//     }
-
-//     if (validateData.name && validateData.city_id) {
-//         const existingHospital = await prisma.hospital.findFirst({
-//             where: {
-//                 name: validateData.name,
-//                 city_id: validateData.city_id,
-//                 deletedAt: null,
-//                 NOT: { id }
-//             }
-//         });
-
-//         if (existingHospital) {
-//             throw new HttpException('Hospital with same name in this city already exists', 400);
-//         }
-//     }
-
-//     // Jika ada file baru, replace image
-//     let imagePath = hospital.image; // pakai yang lama
-//     if (req.file) {
-//         imagePath = `/storage/img/${req.file.filename}`; // path relatif
-//     }
-
-//     // Handle koordinat dan gmaps_url
-//     let latitude = hospital.latitude;
-//     let longitude = hospital.longitude;
-//     let gmapsUrl = hospital.gmaps_url;
-
-//     if (
-//         validateData.latitude !== undefined &&
-//         validateData.longitude !== undefined &&
-//         validateData.latitude !== null &&
-//         validateData.longitude !== null
-//     ) {
-//         // Jika diberikan lat long langsung
-//         latitude = validateData.latitude;
-//         longitude = validateData.longitude;
-//         gmapsUrl = validateData.gmaps_url || gmapsUrl;
-//     } else if (
-//         validateData.gmaps_url &&
-//         typeof validateData.gmaps_url === "string" &&
-//         validateData.gmaps_url.trim() !== ""
-//     ) {
-//         gmapsUrl = validateData.gmaps_url;
-
-//         if (gmapsUrl.includes("www.google.com/maps")) {
-//             const regex = /@(-?\d+\.\d+),(-?\d+\.\d+)/;
-//             const match = gmapsUrl.match(regex);
-//             if (match) {
-//                 latitude = parseFloat(match[1]);
-//                 longitude = parseFloat(match[2]);
-//             } else {
-//                 throw new HttpException("Unable to extract coordinates from gmaps_url", 400);
-//             }
-//         } else if (gmapsUrl.includes("maps.app.goo.gl")) {
-//             // Tidak bisa ambil koordinat langsung
-//             latitude = null;
-//             longitude = null;
-//         } else {
-//             throw new HttpException("gmaps_url must be a valid Google Maps URL", 400);
-//         }
-//     }
-
-//     const payload = {
-//         ...validateData,
-//         image: imagePath,
-//         // created_by: req.user.id,
-//         latitude,
-//         longitude,
-//         gmaps_url: gmapsUrl,
-//     };
-
-//     const data = await salesHospitalRepository.update(id, payload);
-//     await updateLog(req, data);
-// };
-
-// exports.showHospitalService = async (id) => {
-//     const hospital = await salesHospitalRepository.findById(id);
-//     if (!hospital) {
-//         throw new HttpException("Data hospital not found", 404);
-//     }
-
-//     // const userName = await getUserNameById(hospital.created_by);
-
-//     return { hospital };
-// };
+};

src/services/sales/StatusHistoryService.ts

@@ -4,6 +4,7 @@ import { createLog } from '../../utils/LogActivity';
 import StatusHistoryRepository from '../../repository/sales/StatusHistoryRepository';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { StatusHistoryRequestDTO } from '../../types/sales/status_history/StatusHistoryDTO';
+import { storeCategoryLinkService } from '../admin/CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -115,7 +116,7 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         },
         old_status: hospital.progress_status,
         new_status: validateData.new_status as ProgressStatus,
-        note: validateData.note,
+        note: validateData.note?.note,
     };
 
     const data = await StatusHistoryRepository.create(payload);
@@ -125,105 +126,14 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         data: { progress_status: validateData.new_status as ProgressStatus },
     });
 
-    await createLog(req, data);
-};
+    if (validateData.note?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.note.tags,
+            'status_history_notes',
+            data.id,
+            req
+        );
+    }
 
-// const HttpException = require('../../utils/HttpException.js');
-// const prisma = require('../../prisma/PrismaClient.js');
-// const { createLog } = require('../../utils/LogActivity.js');
-// const StatusHistoryRepository = require('../../repository/sales/StatusHistoryRepository.js');
-
-// exports.getAllStatusHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
-//     const skip = (page - 1) * limit;
-
-//     const userId = req.tokenData.sub;
-//     const hospitalId = req.params.id;
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const userAreas = await prisma.userArea.findMany({
-//         where: { user_id: userId },
-//         select: { province_id: true }
-//     });
-
-//     const userProvinceIds = userAreas.map(ua => ua.province_id);
-
-//     if (!userProvinceIds.includes(hospital.province_id)) {
-//         throw new HttpException("This hospital is not your area", 403);
-//     }
-
-//     const where = {
-//         hospital_id: req.params.id,
-//         deletedAt: null
-//     };
-
-//     const [status_histories, total] = await Promise.all([
-//         StatusHistoryRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         StatusHistoryRepository.countAll(where)
-//     ]);
-
-//     return { status_histories, total };
-// };
-
-// const validProgressStatuses = ['cari_data', 'dihubungi', 'negosiasi', 'follow_up', 'mou', 'onboarded', 'tidak_berminat'];
-
-// exports.storeStatusHistoryService = async (validateData, req) => {
-//     const hospitalId = req.params.id;
-//     const userId = req.tokenData.sub;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const userAreas = await prisma.userArea.findMany({
-//         where: { user_id: userId },
-//         select: { province_id: true }
-//     });
-
-//     const userProvinceIds = userAreas.map(ua => ua.province_id);
-
-//     if (!userProvinceIds.includes(hospital.province_id)) {
-//         throw new HttpException("This hospital is not your area", 403);
-//     }
-
-//     if (validateData.new_status && !validProgressStatuses.includes(validateData.new_status)) {
-//         throw new HttpException(
-//             `Invalid new_status. Allowed values are: ${validProgressStatuses.join(', ')}`,
-//             422
-//         );
-//     }
-
-//     if (validateData.new_status === hospital.progress_status) {
-//         throw new HttpException("New status change is the same as old status", 400)
-//     }
-
-//     const payload = {
-//         hospital_id: hospitalId,
-//         user_id: userId,
-//         old_status: hospital.progress_status,
-//         new_status: validateData.new_status,
-//         note: validateData.note,
-//     };
-
-//     const data = await StatusHistoryRepository.create(payload);
-
-//     await prisma.hospital.update({
-//         where: { id: hospitalId },
-//         data: {
-//             progress_status: validateData.new_status
-//         }
-//     });
-
-//     await createLog(req, data);
-// };
+    await createLog(req, data);
+};

src/services/sales/VendorExperienceService.ts

@@ -5,6 +5,7 @@ import { createLog, updateLog, deleteLog } from '../../utils/LogActivity';
 import VendorExperienceRepository from '../../repository/sales/VendorExperienceRepository';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import { VendorExperienceRequestDTO } from '../../types/sales/vendor_experience/VendorExperienceDTO';
+import { storeCategoryLinkService, updateCategoryLinkService } from '../admin/CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -160,14 +161,33 @@ export const storeVendorExperienceService = async (validateData: VendorExperienc
         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : null,
         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : null,
         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : null,
-        positive_notes: validateData.positive_notes,
-        negative_notes: validateData.negative_notes,
+        positive_notes: validateData.positive_notes?.note,
+        negative_notes: validateData.negative_notes?.note,
         hospital: {
             connect: { id: hospitalId }
         },
     };
 
     const data = await VendorExperienceRepository.create(payload);
+
+    if (validateData.positive_notes?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.positive_notes.tags,
+            'vendor_experience_positive_notes',
+            data.id,
+            req
+        );
+    }
+
+    if (validateData.negative_notes?.tags?.length) {
+        await storeCategoryLinkService(
+            validateData.negative_notes.tags,
+            'vendor_experience_negative_notes',
+            data.id,
+            req
+        );
+    }
+
     await createLog(req, data);
 };
 
@@ -224,27 +244,27 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
         });
     }
 
-   if (
+    if (
         validateData.contract_value_min &&
         validateData.contract_value_min >= vendorHistory.contract_value_max!
     ) {
         throw new HttpException('Contract value min must be less than contract value max.', 400);
     }
-    
+
     if (
         validateData.contract_value_max &&
         validateData.contract_value_max <= vendorHistory.contract_value_min!
     ) {
         throw new HttpException('Contract value max must be greater than contract value min.', 400);
     }
-    
+
     if (
         validateData.contract_start_date &&
         validateData.contract_start_date >= vendorHistory.contract_expired_date!
     ) {
         throw new HttpException('Contract start date must be before contract expired date.', 400);
     }
-    
+
     if (
         validateData.contract_expired_date &&
         validateData.contract_expired_date <= vendorHistory.contract_start_date!
@@ -284,13 +304,34 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : vendorHistory.contract_value_min,
         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : vendorHistory.contract_value_max,
-        positive_notes: validateData.positive_notes,
-        negative_notes: validateData.negative_notes,
+        positive_notes: validateData.positive_notes?.note,
+        negative_notes: validateData.negative_notes?.note,
         simrs_type: validateData.simrs_type,
         vendor_id: validateData.vendor_id
     };
 
     const data = await VendorExperienceRepository.update(id_vendor_experience, payload);
+
+    // Positive Notes Tags
+    if (validateData.positive_notes?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.positive_notes.tags,
+            'vendor_experience_positive_notes',
+            id_vendor_experience,
+            req
+        );
+    }
+
+    // Negative Notes Tags
+    if (validateData.negative_notes?.tags?.length) {
+        await updateCategoryLinkService(
+            validateData.negative_notes.tags,
+            'vendor_experience_negative_notes',
+            id_vendor_experience,
+            req
+        );
+    }
+
     await updateLog(req, data);
 };
 
@@ -325,476 +366,4 @@ export const deleteVendorExperienceService = async (req: CustomRequest) => {
     });
 
     await deleteLog(req, data);
-};
-
-// const VendorExperienceRepository = require('../../repository/sales/VendorExperienceRepository.js');
-// const HttpException = require('../../utils/HttpException.js');
-// const prisma = require('../../prisma/PrismaClient.js');
-// const timeLocal = require('../../utils/TimeLocal.js');
-// const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
-
-// exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
-//     const skip = (page - 1) * limit;
-
-//     const hospitalId = req.params.id;
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const where = {
-//         // ...SearchFilter(search, ['name', 'name_pt']),
-//         hospital_id: req.params.id,
-//         deletedAt: null
-//     };
-
-//     const [vendor_histories, total] = await Promise.all([
-//         VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         VendorExperienceRepository.countAll(where)
-//     ]);
-
-//     return { vendor_histories, total };
-// };
-
-// exports.showVendorHistoryService = async (req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendorHistory) {
-//         throw new HttpException("Vendor experience not found", 404);
-//     }
-
-//     return vendorHistory;
-// };
-
-// exports.storeVendorHistoryService = async (validateData, req) => {
-//     const hospitalId = req.params.id;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     });
-
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     if (validateData.vendor_id) {
-//         const vendor = await prisma.vendor.findFirst({
-//             where: {
-//                 id: validateData.vendor_id
-//             }
-//         });
-
-//         if (!vendor) {
-//             throw new HttpException("Vendor not found", 404)
-//         }
-//     }
-
-//     const SimrsType = ["vendor", "in house", "gratis"];
-//     if (validateData.simrs_type && !SimrsType.includes(validateData.simrs_type)) {
-//         throw new HttpException("Simrs type must be vendor, in house, or gratis", 400);
-//     }
-
-//     if (validateData.contract_start_date && validateData.contract_expired_date) {
-//         if (validateData.contract_start_date >= validateData.contract_expired_date) {
-//             throw new HttpException("Contract expired date must be after contract date", 400)
-//         }
-//     }
-
-//     if (validateData.contract_value_min && validateData.contract_value_max) {
-//         if (validateData.contract_value_min >= validateData.contract_value_max) {
-//             throw new HttpException("Contract value max must be after contract value min", 400)
-//         }
-//     }
-
-//     // await prisma.hospital.update({
-//     //     where: { id: hospitalId },
-//     //     data: {
-//     //         simrs_type: validateData.simrs_type
-//     //     }
-//     // });
-
-//     if (validateData.simrs_type) {
-//         const existingActiveVendors = await prisma.vendorExperience.findMany({
-//             where: {
-//                 hospital_id: hospitalId,
-//                 status: "active",
-//                 deletedAt: null
-//             }
-//         });
-
-//         if (existingActiveVendors.length > 0) {
-//             await prisma.vendorExperience.updateMany({
-//                 where: {
-//                     hospital_id: hospitalId,
-//                     status: "active",
-//                     deletedAt: null
-//                 },
-//                 data: {
-//                     status: "inactive"
-//                 }
-//             });
-//         }
-
-//         validateData.status = "active";
-//     }
-
-//     const payload = {
-//         vendor_id: validateData.vendor_id,
-//         simrs_type: validateData.simrs_type,
-//         status: validateData.status,
-//         contract_start_date: validateData.contract_start_date ? new Date(validateData.contract_start_date) : null,
-//         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : null,
-//         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : null,
-//         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : null,
-//         positive_notes: validateData.positive_notes,
-//         negative_notes: validateData.negative_notes,
-//         hospital_id: hospitalId
-//     };
-
-//     const data = await VendorExperienceRepository.create(payload);
-//     await createLog(req, data);
-// };
-
-// exports.updateVendorHistoryService = async (validateData, req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const vendorHistory = await VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendorHistory) {
-//         throw new HttpException("Vendor experience not found", 404);
-//     }
-
-//     if (validateData.vendor_id) {
-//         const existVendor = await prisma.vendor.findFirst({
-//             where: {
-//                 id: validateData.vendor_id
-//             }
-//         });
-//         if (!existVendor) {
-//             throw new HttpException("Vendor not found", 404)
-//         }
-//     }
-
-//     const SimrsType = ["vendor", "in house", "gratis"];
-//     if (validateData.simrs_type && !SimrsType.includes(validateData.simrs_type)) {
-//         throw new HttpException("Simrs type must be vendor, in house, or gratis", 400);
-//     }
-
-//     if (
-//         validateData.simrs_type &&
-//         vendorHistory.simrs_type === "vendor" &&
-//         vendorHistory.vendor_id !== null &&
-//         validateData.simrs_type !== "vendor"
-//     ) {
-//         await prisma.vendorExperience.update({
-//             where: {
-//                 id: id_vendor_experience,
-//                 deletedAt: null
-//             },
-//             data: {
-//                 vendor_id: null
-//             }
-//         });
-//     }
-
-//     if (validateData.contract_start_date && validateData.contract_expired_date) {
-//         if (validateData.contract_start_date >= validateData.contract_expired_date) {
-//             throw new HttpException("Contract expired date must be after contract date", 400)
-//         }
-//     }
-
-//     if (validateData.contract_value_min && validateData.contract_value_max) {
-//         if (validateData.contract_value_min >= validateData.contract_value_max) {
-//             throw new HttpException("Contract value max must be after contract value min", 400)
-//         }
-//     }
-
-//     if (validateData.status === "active") {
-//         await prisma.vendorExperience.updateMany({
-//             where: {
-//                 hospital_id: id_hospital,
-//                 status: "active",
-//                 deletedAt: null,
-//                 NOT: { id: id_vendor_experience },
-//             },
-//             data: {
-//                 status: "inactive",
-//             },
-//         });
-//     }
-
-//     const payload = {
-//         status: validateData.status,
-//         contract_start_date: validateData.contract_start_date ? new Date(validateData.contract_start_date) : vendorHistory.contract_start_date,
-//         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
-//         contract_value_min: validateData.contract_value_min ? Number(validateData.contract_value_min) : vendorHistory.contract_value_min,
-//         contract_value_max: validateData.contract_value_max ? Number(validateData.contract_value_max) : vendorHistory.contract_value_max,
-//         positive_notes: validateData.positive_notes,
-//         negative_notes: validateData.negative_notes,
-//         simrs_type: validateData.simrs_type,
-//         vendor_id: validateData.vendor_id,
-//     };
-
-//     const data = await VendorExperienceRepository.update(id_vendor_experience, payload);
-//     await updateLog(req, data);
-// };
-
-// exports.deleteVendorHistoryService = async (req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const vendor = await VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendor) {
-//         throw new HttpException("Vendor experience not found", 404);
-//     }
-
-//     const data = await VendorExperienceRepository.update(id_vendor_experience, {
-//         deletedAt: timeLocal.now().toDate()
-//     });
-
-//     await deleteLog(req, data);
-// };
-
-// ==============================================================
-
-// exports.getAllVendorHistoryService = async ({ page, limit, search, sortBy, orderBy }, req) => {
-//     const skip = (page - 1) * limit;
-
-//     const hospitalId = req.params.id;
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const where = {
-//         // ...SearchFilter(search, ['name', 'name_pt']),
-//         hospital_id: req.params.id,
-//         deletedAt: null
-//     };
-
-//     const [vendor_histories, total] = await Promise.all([
-//         VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         VendorExperienceRepository.countAll(where)
-//     ]);
-
-//     return { vendor_histories, total };
-// };
-
-// exports.showVendorHistoryService = async (req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendorHistory) {
-//         throw new HttpException("Vendor history not found", 404);
-//     }
-
-//     return vendorHistory;
-// };
-
-// exports.storeVendorHistoryService = async (validateData, req) => {
-//     const hospitalId = req.params.id;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: hospitalId
-//         }
-//     });
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     const vendor = await prisma.vendor.findFirst({
-//         where: {
-//             id: validateData.vendor_id
-//         }
-//     });
-//     if (!vendor) {
-//         throw new HttpException("Vendor not found", 404)
-//     }
-
-//     await prisma.hospital.update({
-//         where: { id: hospitalId },
-//         data: {
-//             simrs_type: validateData.simrs_type
-//         }
-//     });
-
-//     if (validateData.simrs_type) {
-//         const existingActiveVendors = await prisma.vendorHistory.findMany({
-//             where: {
-//                 hospital_id: hospitalId,
-//                 status: "active",
-//                 deletedAt: null
-//             }
-//         });
-
-//         if (existingActiveVendors.length > 0) {
-//             await prisma.vendorHistory.updateMany({
-//                 where: {
-//                     hospital_id: hospitalId,
-//                     status: "active",
-//                     deletedAt: null
-//                 },
-//                 data: {
-//                     status: "inactive"
-//                 }
-//             });
-//         }
-
-//         validateData.status = "active";
-//     }
-
-//     const payload = {
-//         vendor_id: validateData.vendor_id,
-//         vendor_impression: validateData.vendor_impression,
-//         status: validateData.status,
-//         contract_date: validateData.contract_date,
-//         contract_expired_date: validateData.contract_expired_date,
-//         hospital_id: hospitalId
-//     };
-
-//     VendorExperienceRepository.create(payload);
-//     await createLog(req, data);
-// };
-
-// exports.updateVendorHistoryService = async (validateData, req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendorHistory) {
-//         throw new HttpException("Vendor history not found", 404);
-//     }
-
-//     if (validateData.vendor_id) {
-//         const existVendor = await prisma.vendor.findFirst({
-//             where: {
-//                 id: validateData.vendor_id
-//             }
-//         });
-//         if (!existVendor) {
-//             throw new HttpException("Vendor not found", 404)
-//         }
-//     }
-
-//     await prisma.hospital.update({
-//         where: { id: id_hospital },
-//         data: {
-//             simrs_type: validateData.simrs_type
-//         }
-//     });
-
-//     if (validateData.contract_date && validateData.contract_expired_date) {
-//         if (validateData.contract_date >= validateData.contract_expired_date) {
-//             throw new HttpException("Contract expired date must be after contract date", 400)
-//         }
-//     }
-
-//     if (validateData.status === "active") {
-//         await prisma.vendorHistory.updateMany({
-//             where: {
-//                 hospital_id: id_hospital,
-//                 status: "active",
-//                 deletedAt: null,
-//                 NOT: { id: id_vendor_experience },
-//             },
-//             data: {
-//                 status: "inactive",
-//             },
-//         });
-//     }
-
-//     const payload = {
-//         vendor_id: validateData.vendor_id,
-//         vendor_impression: validateData.vendor_impression,
-//         status: validateData.status,
-//         contract_date: validateData.contract_date ? new Date(validateData.contract_date) : vendorHistory.contract_date,
-//         contract_expired_date: validateData.contract_expired_date ? new Date(validateData.contract_expired_date) : vendorHistory.contract_expired_date,
-//     };
-
-//     VendorExperienceRepository.update(id_vendor_experience, payload);
-//     await updateLog(req, data);
-// };
-
-// exports.deleteVendorHistoryService = async (req) => {
-//     const id_hospital = req.params.id;
-//     const id_vendor_experience = req.params.id_vendor_experience;
-
-//     const hospital = await prisma.hospital.findFirst({
-//         where: {
-//             id: id_hospital
-//         }
-//     })
-//     if (!hospital) {
-//         throw new HttpException("Hospital not found", 404)
-//     }
-
-//     VendorExperienceRepository.findById(id_vendor_experience);
-//     if (!vendor) {
-//         throw new HttpException("Vendor history not found", 404);
-//     }
-
-//     VendorExperienceRepository.update(id_vendor_experience, {
-//         deletedAt: timeLocal.now().toDate()
-//     });
-
-//     await deleteLog(req, data);
-// };
+};

src/types/admin/category/CategoryDTO.ts

@@ -0,0 +1,19 @@
+export interface CategoryRequestDTO {
+    tag: string;
+    description?: string | null;
+}
+
+export interface CategoryDTO {
+    id: string;
+    tag: string;
+    description?: string | null;
+    count_use_tags?: number | null;
+    createdAt: Date;
+    updatedAt: Date;
+}
+
+export interface MergeCategoryRequestDTO {
+    category_id: string[];
+    tag: string;
+    description?: string | null;
+}

src/types/admin/category_link/CategoryLinkDTO.ts

@@ -0,0 +1,62 @@
+export interface CategoryLinkRequestDTO {
+    category_id: string;
+    source_type?: string | null;
+    source_id?: string | null;
+}
+
+export interface CategoryLinkDTO {
+    id: string;
+    category_id: string;
+    source_type?: string | null;
+    source_id?: string | null;
+    createdAt: Date;
+    updatedAt: Date;
+}
+
+export interface CategoryLinkUseDTO {
+    id: string;
+    category_id: string;
+    source_type?: string | null;
+    source_id?: string | null;
+    createdAt: Date;
+    updatedAt?: Date;
+
+    vendor_experience?: {
+        id: string;
+        status?: string;
+        contract_start_date?: Date;
+        contract_expired_date?: Date;
+        contract_value_min?: number;
+        contract_value_max?: number;
+        positive_notes?: string;
+        negative_notes?: string;
+        simrs_type: string;
+    } | null;
+
+    status_history?: {
+        id: string;
+        old_status: string;
+        new_status: string;
+        note: string;
+    } | null;
+
+    hospital?: {
+        id: string,
+        name: string,
+        hospital_code: string,
+        ownership: string,
+        address: string,
+        contact: string,
+        progress_status: string,
+        note: string,
+    } | null;
+
+    vendor?: {
+        id: string;
+        name: string;
+        name_pt: string;
+        strengths: string;
+        weaknesses: string;
+        website: string;
+    } | null;
+}

src/types/admin/hospital/HospitalDTO.ts

@@ -9,11 +9,12 @@ export interface HospitalRequestDTO {
     city_id?: string;
     address?: string | null;
     contact?: string | null;
-    note?: string | null;
     gmaps_url?: string | null;
     latitude?: number | null;
     longitude?: number | null;
     progress_status?: ProgressStatus;
+    note: string;
+    tags: string[];
 }
 
 export interface HospitalDTO {
@@ -35,6 +36,7 @@ export interface HospitalDTO {
     image: string | null;
     progress_status: ProgressStatus;
     note: string | null;
+    note_tags?: string[];
     latitude: number | null;
     longitude: number | null;
     gmaps_url: string | null;
@@ -52,4 +54,5 @@ export interface HospitalDTO {
         weaknesses: string | null;
         website: string | null;
     } | null;
+    created_by?: string;
 }

src/types/admin/status_history/StatusHistoryDTO.ts

@@ -2,7 +2,10 @@ import { ProgressStatus } from "@prisma/client";
 
 export interface StatusHistoryRequestDTO {
     new_status: string;
-    note?: string | null;
+    note?: {
+        note: string;
+        tags: string[];
+    };
 }
 
 export interface StatusHistoryDTO {
@@ -14,6 +17,7 @@ export interface StatusHistoryDTO {
     old_status: ProgressStatus;
     new_status: ProgressStatus;
     note: string | null;
+    note_tags?: string[];
     createdAt: Date;
     updatedAt: Date;
 }

src/types/admin/vendor/VendorDTO.ts

@@ -1,9 +1,15 @@
 export interface VendorRequestDTO {
     name: string;
     name_pt: string;
-    strengths: string;
-    weaknesses: string;
     website: string;
+    strengths?: {
+        note: string;
+        tags: string[];
+    };
+    weaknesses?: {
+        note: string;
+        tags: string[];
+    };
 }
 
 export interface VendorDTO {
@@ -20,4 +26,6 @@ export interface VendorDTO {
     createdAt: Date;
     updatedAt: Date;
     count_hospitals: number;
+    strengths_tags?: string[];
+    weaknesses_tags?: string[];
 }

src/types/admin/vendor_experience/VendorExperienceDTO.ts

@@ -6,8 +6,14 @@ export interface VendorExperienceRequestDTO {
     contract_expired_date?: Date | null;
     contract_value_min?: number | null;
     contract_value_max?: number | null;
-    positive_notes?: string;
-    negative_notes?: string;
+    positive_notes?: {
+        note: string;
+        tags: string[];
+    };
+    negative_notes?: {
+        note: string;
+        tags: string[];
+    };
 }
 
 export interface VendorExperienceDTO {
@@ -18,6 +24,8 @@ export interface VendorExperienceDTO {
     contract_value_max: bigint | null;
     positive_notes: string | null;
     negative_notes: string | null;
+    positive_notes_tags?: string[];
+    negative_notes_tags?: string[];
     status: string | null;
     simrs_type: string;
     createdAt: Date;

src/types/sales/hospital/HospitalDTO.ts

@@ -9,11 +9,12 @@ export interface HospitalRequestDTO {
     city_id?: string;
     address?: string | null;
     contact?: string | null;
-    note?: string | null;
     gmaps_url?: string | null;
     latitude?: number | null;
     longitude?: number | null;
     progress_status?: ProgressStatus;
+    note: string;
+    tags: string[];
 }
 
 export interface HospitalDTO {
@@ -35,9 +36,11 @@ export interface HospitalDTO {
     image: string | null;
     progress_status: ProgressStatus;
     note: string | null;
+    note_tags?: string[];
     latitude: number | null;
     longitude: number | null;
     gmaps_url: string | null;
+    created_by?: string
     createdAt: Date;
     updatedAt: Date;
     user: {
@@ -52,4 +55,4 @@ export interface HospitalDTO {
         weaknesses: string | null;
         website: string | null;
     } | null;
-}
+}

src/types/sales/status_history/StatusHistoryDTO.ts

@@ -2,7 +2,10 @@ import { ProgressStatus } from "@prisma/client";
 
 export interface StatusHistoryRequestDTO {
     new_status: string;
-    note?: string | null;
+    note?: {
+        note: string;
+        tags: string[];
+    };
 }
 
 export interface StatusHistoryDTO {
@@ -14,6 +17,7 @@ export interface StatusHistoryDTO {
     old_status: ProgressStatus;
     new_status: ProgressStatus;
     note: string | null;
+    note_tags?: string[];
     createdAt: Date;
     updatedAt: Date;
 }

src/types/sales/vendor_experience/VendorExperienceDTO.ts

@@ -6,8 +6,14 @@ export interface VendorExperienceRequestDTO {
     contract_expired_date?: Date | null;
     contract_value_min?: number | null;
     contract_value_max?: number | null;
-    positive_notes?: string;
-    negative_notes?: string;
+    positive_notes?: {
+        note: string;
+        tags: string[];
+    };
+    negative_notes?: {
+        note: string;
+        tags: string[];
+    };
 }
 
 export interface VendorExperienceDTO {
@@ -18,6 +24,8 @@ export interface VendorExperienceDTO {
     contract_value_max: bigint | null;
     positive_notes: string | null;
     negative_notes: string | null;
+    positive_notes_tags?: string[];
+    negative_notes_tags?: string[];
     status: string | null;
     simrs_type: string;
     createdAt: Date;

src/utils/GetSourceDataByType.ts

@@ -0,0 +1,61 @@
+import prisma from '../prisma/PrismaClient';
+
+export const GetSourceDataByType = async (source_type: string, source_id: string) => {
+    switch (source_type) {
+        case 'vendor_experience_negative_notes':
+        case 'vendor_experience_positive_notes':
+            return await prisma.vendorExperience.findFirst({
+                where: { id: source_id },
+                select: {
+                    id: true,
+                    status: true,
+                    contract_start_date: true,
+                    contract_expired_date: true,
+                    contract_value_min: true,
+                    contract_value_max: true,
+                    positive_notes: true,
+                    negative_notes: true,
+                    simrs_type: true,
+                }
+            });
+        case 'status_history_notes':
+            return await prisma.statusHistory.findFirst({
+                where: { id: source_id },
+                select: {
+                    id: true,
+                    old_status: true,
+                    new_status: true,
+                    note: true
+                }
+            });
+        case 'hospital_notes':
+            return await prisma.hospital.findFirst({
+                where: { id: source_id },
+                select: {
+                    id: true,
+                    name: true,
+                    hospital_code: true,
+                    ownership: true,
+                    address: true,
+                    contact: true,
+                    progress_status: true,
+                    note: true,
+                }
+            });
+        case 'vendor_strength_notes':
+        case 'vendor_weaknesses_notes':
+            return await prisma.vendor.findFirst({
+                where: { id: source_id },
+                select: {
+                    id: true,
+                    name: true,
+                    name_pt: true,
+                    strengths: true,
+                    weaknesses: true,
+                    website: true,
+                }
+            });
+        default:
+            return null;
+    }
+};

src/utils/TimeLocal.ts

@@ -7,20 +7,6 @@ import timezone from 'dayjs/plugin/timezone';
 dayjs.extend(utc);
 dayjs.extend(timezone);
 
-// Fungsi untuk mendapatkan waktu sekarang di zona waktu Asia/Jakarta
 const now = (): dayjs.Dayjs => dayjs().tz('Asia/Jakarta');
 
-export { now };
-
-
-// // utils/TimeLocal.js
-// const dayjs = require('dayjs');
-// const utc = require('dayjs/plugin/utc');
-// const timezone = require('dayjs/plugin/timezone');
-
-// dayjs.extend(utc);
-// dayjs.extend(timezone);
-
-// const now = () => dayjs().tz('Asia/Jakarta');
-
-// module.exports = { now };
+export { now };

src/validators/admin/category/CategoryValidators.ts

@@ -0,0 +1,49 @@
+import Joi from 'joi';
+import { validateWithSchema } from '../../ValidateSchema';
+import { CategoryRequestDTO, MergeCategoryRequestDTO } from '../../../types/admin/category/CategoryDTO';
+
+const storeCategorySchema = Joi.object<CategoryRequestDTO>({
+    tag: Joi.string().trim().required().messages({
+        'string.empty': 'Tag is required',
+    }),
+    description: Joi.string().trim().optional().allow(''),
+});
+
+const updateCategorySchema = Joi.object<Partial<CategoryRequestDTO>>({
+    tag: Joi.string().trim().optional().messages({
+        'string.empty': 'Tag is required',
+    }),
+    description: Joi.string().trim().optional().allow(''),
+});
+
+const mergeCategorySchema = Joi.object<MergeCategoryRequestDTO>({
+    category_id: Joi.array()
+        .items(Joi.string().trim().min(2))
+        .min(1)
+        .required()
+        .messages({
+            'any.required': 'Category ID is required',
+            'array.base': 'Category ID must be an array of strings',
+            'array.min': 'At least one category ID is required',
+            'string.empty': 'Each Category ID must not be empty',
+            'string.min': 'Each Category ID must not be empty',
+        }),
+
+    tag: Joi.string().trim().required().messages({
+        'string.empty': 'Tag is required',
+        'any.required': 'Tag is required',
+    }),
+    description: Joi.string().trim().optional().allow(''),
+});
+
+export const validateCategoryStoreRequest = (body: unknown): CategoryRequestDTO => {
+    return validateWithSchema<CategoryRequestDTO>(storeCategorySchema, body);
+};
+
+export const validateCategoryUpdateRequest = (body: unknown): CategoryRequestDTO => {
+    return validateWithSchema<CategoryRequestDTO>(updateCategorySchema, body);
+}
+
+export const validateMergeCategoryStoreRequest = (body: unknown): MergeCategoryRequestDTO => {
+    return validateWithSchema<MergeCategoryRequestDTO>(mergeCategorySchema, body);
+};

src/validators/admin/hospital/HospitalValidators.ts

@@ -27,9 +27,8 @@ export const storeHospitalSchema = Joi.object({
     contact: Joi.string().trim().required().messages({
         'string.empty': 'contact is required',
     }),
-    note: Joi.string().trim().required().messages({
-        'string.empty': 'note is required',
-    }),
+    note: Joi.string().allow('', null),
+    tags: Joi.array().items(Joi.string()).optional().default([]),
     gmaps_url: Joi.string().trim().optional().allow(null, ''),
     image: Joi.any().optional().allow(null, ''),
     latitude: Joi.number().optional().allow(null),
@@ -45,7 +44,8 @@ export const updateHospitalSchema = Joi.object({
     city_id: Joi.string().trim().optional(),
     address: Joi.string().trim().optional(),
     contact: Joi.string().trim().optional(),
-    note: Joi.string().trim().optional(),
+    note: Joi.string().allow('', null),
+    tags: Joi.array().items(Joi.string()).optional().default([]),
     image: Joi.any().optional().allow(null, ''),
     gmaps_url: Joi.string().trim().optional().allow(null, ''),
     latitude: Joi.number().optional().allow(null),
@@ -58,177 +58,4 @@ export const validateStoreHospitalRequest = (body: unknown): HospitalRequestDTO
 
 export const validateUpdateHospitalRequest = (body: unknown): Partial<HospitalRequestDTO> => {
     return validateWithSchema<Partial<HospitalRequestDTO>>(updateHospitalSchema, body);
-}
-
-// import { HospitalRequestDTO } from '../../../types/admin/hospital/HospitalDTO';
-// import { HttpException } from '../../../utils/HttpException';
-
-// const parseToNullableFloat = (value: unknown): number | null => {
-//     if (typeof value === 'number') return value;
-//     if (typeof value === 'string' && value.trim() !== '') return parseFloat(value);
-//     return null;
-// };
-
-// const safeTrim = (value: unknown): string | undefined => {
-//     return typeof value === 'string' ? value.trim() : undefined;
-// };
-
-// export const validateStoreHospitalRequest = (body: HospitalRequestDTO): HospitalRequestDTO => {
-//     const {
-//         name,
-//         hospital_code,
-//         type,
-//         ownership,
-//         province_id,
-//         city_id,
-//         address,
-//         contact,
-//         note,
-//         gmaps_url,
-//         latitude,
-//         longitude,
-//     } = body;
-
-//     const errors: Record<string, string[]> = {};
-
-//     if (!name?.trim()) errors.name = ['name is required'];
-//     if (!hospital_code?.trim()) errors.hospital_code = ['hospital code is required'];
-//     if (!type?.trim()) errors.type = ['type is required'];
-//     if (!ownership?.trim()) errors.ownership = ['ownership is required'];
-//     if (!province_id?.trim()) errors.province_id = ['province id is required'];
-//     if (!city_id?.trim()) errors.city_id = ['city id is required'];
-//     if (!address?.trim()) errors.address = ['address is required'];
-//     if (!contact?.trim()) errors.contact = ['contact is required'];
-//     if (!note?.trim()) errors.note = ['note is required'];
-
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
-
-//     return {
-//         name: safeTrim(name)!,
-//         hospital_code: safeTrim(hospital_code)!,
-//         type: safeTrim(type)!,
-//         ownership: safeTrim(ownership)!,
-//         province_id: safeTrim(province_id)!,
-//         city_id: safeTrim(city_id)!,
-//         address: safeTrim(address)!,
-//         contact: safeTrim(contact)!,
-//         note: safeTrim(note)!,
-//         gmaps_url: safeTrim(gmaps_url) ?? null,
-//         latitude: parseToNullableFloat(latitude),
-//         longitude: parseToNullableFloat(longitude),
-//     };
-// };
-
-// export const validateUpdateHospitalRequest = (body: HospitalRequestDTO): Partial<HospitalRequestDTO> => {
-//     return {
-//         ...body,
-//         gmaps_url: safeTrim(body.gmaps_url) ?? null,
-//         latitude: parseToNullableFloat(body.latitude),
-//         longitude: parseToNullableFloat(body.longitude),
-//     };
-// };
-
-// import { HttpException } from '../../../utils/HttpException';
-
-// interface HospitalDTO {
-//     name: string;
-//     hospital_code: string;
-//     type: string;
-//     ownership: string;
-//     province_id: string;
-//     city_id: string;
-//     address: string;
-//     contact: string;
-//     note: string;
-//     gmaps_url?: string | null;
-//     latitude?: string | number | null;
-//     longitude?: string | number | null;
-// }
-
-// interface HospitalUpdateDTO extends Partial<HospitalDTO> { }
-
-// interface ErrorObject {
-//     [key: string]: string[];
-// }
-
-// export const validateStoreHospitalRequest = (body: Partial<HospitalDTO>): HospitalDTO => {
-//     const {
-//         name,
-//         hospital_code,
-//         type,
-//         ownership,
-//         province_id,
-//         city_id,
-//         address,
-//         contact,
-//         note,
-//         gmaps_url,
-//         latitude,
-//         longitude
-//     } = body;
-
-//     const errors: ErrorObject = {};
-
-//     if (!name?.trim()) errors.name = ['name is required'];
-//     if (!hospital_code?.trim()) errors.hospital_code = ['hospital code is required'];
-//     if (!type?.trim()) errors.type = ['type is required'];
-//     if (!ownership?.trim()) errors.ownership = ['ownership is required'];
-//     if (!province_id?.trim()) errors.province_id = ['province id is required'];
-//     if (!city_id?.trim()) errors.city_id = ['city id is required'];
-//     if (!address?.trim()) errors.address = ['address is required'];
-//     if (!contact?.trim()) errors.contact = ['contact is required'];
-//     if (!note?.trim()) errors.note = ['note is required'];
-
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
-
-//     return {
-//         name: name!.trim(),
-//         hospital_code: hospital_code!.trim(),
-//         type: type!.trim(),
-//         ownership: ownership!.trim(),
-//         province_id: province_id!.trim(),
-//         city_id: city_id!.trim(),
-//         address: address!.trim(),
-//         contact: contact!.trim(),
-//         note: note!.trim(),
-//         gmaps_url: gmaps_url?.trim() || null,
-//         latitude: latitude != null ? parseFloat(latitude as string) : null,
-//         longitude: longitude != null ? parseFloat(longitude as string) : null,
-//     };
-// };
-
-// export const validateUpdateHospitalRequest = (body: HospitalUpdateDTO): HospitalUpdateDTO => {
-//     const {
-//         name,
-//         hospital_code,
-//         type,
-//         ownership,
-//         province_id,
-//         city_id,
-//         address,
-//         contact,
-//         note,
-//         gmaps_url,
-//         latitude,
-//         longitude
-//     } = body;
-
-//     return {
-//         name,
-//         hospital_code,
-//         type,
-//         ownership,
-//         province_id,
-//         city_id,
-//         address,
-//         contact,
-//         note,
-//         gmaps_url: gmaps_url ? gmaps_url.trim() : null,
-//         latitude: latitude !== undefined && latitude !== null ? parseFloat(latitude as string) : null,
-//         longitude: longitude !== undefined && longitude !== null ? parseFloat(longitude as string) : null,
-//     };
-// };
+}

src/validators/admin/status_history/StatusHistoryValidators.ts

@@ -13,34 +13,13 @@ const statusHistorySchema = Joi.object<StatusHistoryRequestDTO>({
             'any.only': `new_status must be one of: ${allowedStatuses.join(', ')}`,
             'string.base': 'new_status must be a string',
         }),
-    note: Joi.string().trim().allow(null, '').optional(),
+    // note: Joi.string().trim().allow(null, '').optional(),
+    note: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const validateCreateStatusHisotryRequest = (body: unknown): StatusHistoryRequestDTO => {
     return validateWithSchema<StatusHistoryRequestDTO>(statusHistorySchema, body);
-};
-
-// import { StatusHistoryRequestDTO } from '../../../types/admin/status_history/StatusHistoryDTO';
-// import { HttpException } from '../../../utils/HttpException';
-
-// export const validateCreateStatusHisotryRequest = (
-//     body: StatusHistoryRequestDTO
-// ): StatusHistoryRequestDTO => {
-//     const errors: Record<string, string[]> = {};
-
-//     const new_status = body.new_status?.trim();
-//     const note = body.note?.trim();
-
-//     if (!new_status) {
-//         errors.new_status = ['new_status is required'];
-//     }
-
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
-
-//     return {
-//         new_status,
-//         note: note ? note : null,
-//     };
-// };
+};

src/validators/admin/vendor/VendorValidators.ts

@@ -9,15 +9,24 @@ const vendorSchema = Joi.object<VendorRequestDTO>({
     name_pt: Joi.string().trim().required().messages({
         'string.empty': 'Vendor name pt is required',
     }),
-    strengths: Joi.string().trim().required().messages({
-        'string.empty': 'Vendor strengths is required',
-    }),
-    weaknesses: Joi.string().trim().required().messages({
-        'string.empty': 'Vendor weaknesses is required',
-    }),
+    // strengths: Joi.string().trim().required().messages({
+    //     'string.empty': 'Vendor strengths is required',
+    // }),
+    // weaknesses: Joi.string().trim().required().messages({
+    //     'string.empty': 'Vendor weaknesses is required',
+    // }),
     website: Joi.string().trim().required().messages({
         'string.empty': 'Vendor website is required',
     }),
+    strengths: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    weaknesses: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 const updateVendorSchema = Joi.object<Partial<VendorRequestDTO>>({
@@ -27,15 +36,24 @@ const updateVendorSchema = Joi.object<Partial<VendorRequestDTO>>({
     name_pt: Joi.string().trim().optional().messages({
         'string.empty': 'Vendor name_pt is required',
     }),
-    strengths: Joi.string().trim().optional().messages({
-        'string.empty': 'Vendor strengths is required',
-    }),
-    weaknesses: Joi.string().trim().optional().messages({
-        'string.empty': 'Vendor weaknesses is required',
-    }),
+    // strengths: Joi.string().trim().optional().messages({
+    //     'string.empty': 'Vendor strengths is required',
+    // }),
+    // weaknesses: Joi.string().trim().optional().messages({
+    //     'string.empty': 'Vendor weaknesses is required',
+    // }),
     website: Joi.string().trim().optional().messages({
         'string.empty': 'Vendor website is required',
     }),
+    strengths: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    weaknesses: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const validateStoreVendorRequest = (body: unknown): VendorRequestDTO => {

src/validators/admin/vendor_experience/VendorExperienceValidators.ts

@@ -16,8 +16,15 @@ export const storeVendorExperienceSchema = Joi.object({
     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
-    positive_notes: Joi.string().optional().allow('', null),
-    negative_notes: Joi.string().optional().allow('', null),
+    positive_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    negative_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const updateVendorExperienceSchema = Joi.object({
@@ -28,8 +35,15 @@ export const updateVendorExperienceSchema = Joi.object({
     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
-    positive_notes: Joi.string().optional().allow('', null),
-    negative_notes: Joi.string().optional().allow('', null),
+    positive_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    negative_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const validateStoreVendorExperienceRequest = (body: unknown): VendorExperienceRequestDTO => {
@@ -38,73 +52,4 @@ export const validateStoreVendorExperienceRequest = (body: unknown): VendorExper
 
 export const validateUpdateVendorExperienceRequest = (body: unknown): Partial<VendorExperienceRequestDTO> => {
     return validateWithSchema<Partial<VendorExperienceRequestDTO>>(updateVendorExperienceSchema, body);
-}
-
-// import { VendorExperienceRequestDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
-// import { HttpException } from '../../../utils/HttpException';
-
-// export const validateStoreVendorExperienceRequest = (body: VendorExperienceRequestDTO): VendorExperienceRequestDTO => {
-//     const {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     } = body;
-
-//     const errors: Record<string, string[]> = {};
-
-//     if (!simrs_type || simrs_type.trim() === '') {
-//         errors.simrs_type = ['simrs type is required'];
-//     }
-
-//     if (!status || status.trim() === '') {
-//         errors.status = ['Status is required'];
-//     }
-
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
-
-//     return {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     };
-// };
-
-// export const validateUpdateVendorExperienceRequest = (body: VendorExperienceRequestDTO): Partial<VendorExperienceRequestDTO> => {
-//     const {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     } = body;
-
-//     return {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     };
-// };
+}

src/validators/sales/status_history/StatusHistoryValidators.ts

@@ -13,34 +13,13 @@ const statusHistorySchema = Joi.object<StatusHistoryRequestDTO>({
             'any.only': `new_status must be one of: ${allowedStatuses.join(', ')}`,
             'string.base': 'new_status must be a string',
         }),
-    note: Joi.string().trim().allow(null, '').optional(),
+    // note: Joi.string().trim().allow(null, '').optional(),
+    note: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const validateCreateStatusHisotryRequest = (body: unknown): StatusHistoryRequestDTO => {
     return validateWithSchema<StatusHistoryRequestDTO>(statusHistorySchema, body);
-};
-
-// import { StatusHistoryRequestDTO } from '../../../types/sales/status_history/StatusHistoryDTO';
-// import { HttpException } from '../../../utils/HttpException';
-
-// export const validateCreateStatusHisotryRequest = (
-//     body: StatusHistoryRequestDTO
-// ): StatusHistoryRequestDTO => {
-//     const errors: Record<string, string[]> = {};
-
-//     const new_status = body.new_status?.trim();
-//     const note = body.note?.trim();
-
-//     if (!new_status) {
-//         errors.new_status = ['new_status is required'];
-//     }
-
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
-
-//     return {
-//         new_status,
-//         note: note ? note : null,
-//     };
-// };
+};

src/validators/sales/vendor_experience/VendorExperienceValidators.ts

@@ -1,6 +1,6 @@
 import Joi from 'joi';
 import { validateWithSchema } from '../../ValidateSchema';
-import { VendorExperienceRequestDTO } from '../../../types/sales/vendor_experience/VendorExperienceDTO';
+import { VendorExperienceRequestDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
 
 export const storeVendorExperienceSchema = Joi.object({
     simrs_type: Joi.string().trim().required().messages({
@@ -16,8 +16,15 @@ export const storeVendorExperienceSchema = Joi.object({
     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
-    positive_notes: Joi.string().optional().allow('', null),
-    negative_notes: Joi.string().optional().allow('', null),
+    positive_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    negative_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const updateVendorExperienceSchema = Joi.object({
@@ -28,8 +35,15 @@ export const updateVendorExperienceSchema = Joi.object({
     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
-    positive_notes: Joi.string().optional().allow('', null),
-    negative_notes: Joi.string().optional().allow('', null),
+    positive_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
+
+    negative_notes: Joi.object({
+        note: Joi.string().allow('', null),
+        tags: Joi.array().items(Joi.string()).optional().default([]),
+    }).optional().allow(null),
 });
 
 export const validateStoreVendorExperienceRequest = (body: unknown): VendorExperienceRequestDTO => {
@@ -40,72 +54,44 @@ export const validateUpdateVendorExperienceRequest = (body: unknown): Partial<Ve
     return validateWithSchema<Partial<VendorExperienceRequestDTO>>(updateVendorExperienceSchema, body);
 }
 
-
+// import Joi from 'joi';
+// import { validateWithSchema } from '../../ValidateSchema';
 // import { VendorExperienceRequestDTO } from '../../../types/sales/vendor_experience/VendorExperienceDTO';
-// import { HttpException } from '../../../utils/HttpException';
-
-// export const validateStoreVendorExperienceRequest = (body: VendorExperienceRequestDTO): VendorExperienceRequestDTO => {
-//     const {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     } = body;
-
-//     const errors: Record<string, string[]> = {};
-
-//     if (!simrs_type || simrs_type.trim() === '') {
-//         errors.simrs_type = ['simrs type is required'];
-//     }
-
-//     if (!status || status.trim() === '') {
-//         errors.status = ['Status is required'];
-//     }
 
-//     if (Object.keys(errors).length > 0) {
-//         throw new HttpException(errors, 422);
-//     }
+// export const storeVendorExperienceSchema = Joi.object({
+//     simrs_type: Joi.string().trim().required().messages({
+//         'string.empty': 'Simrs type is required',
+//         'string.base': 'Simrs type must be a string',
+//     }),
+//     vendor_id: Joi.string().uuid().optional(),
+//     status: Joi.string().trim().required().messages({
+//         'string.empty': 'Status is required',
+//         'string.base': 'Status must be a string',
+//     }),
+//     contract_start_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract start date must be a valid date' }),
+//     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
+//     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
+//     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
+//     positive_notes: Joi.string().optional().allow('', null),
+//     negative_notes: Joi.string().optional().allow('', null),
+// });
 
-//     return {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     };
-// };
+// export const updateVendorExperienceSchema = Joi.object({
+//     simrs_type: Joi.string().trim().optional(),
+//     vendor_id: Joi.string().uuid().optional(),
+//     status: Joi.string().trim().optional(),
+//     contract_start_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract start date must be a valid date' }),
+//     contract_expired_date: Joi.date().optional().allow(null).messages({ 'date.format': 'Contract expired date must be a valid date' }),
+//     contract_value_min: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value min must be a number' }),
+//     contract_value_max: Joi.number().optional().allow(null).messages({ 'number.format': 'Contract value max must be a number' }),
+//     positive_notes: Joi.string().optional().allow('', null),
+//     negative_notes: Joi.string().optional().allow('', null),
+// });
 
-// export const validateUpdateVendorExperienceRequest = (body: VendorExperienceRequestDTO): Partial<VendorExperienceRequestDTO> => {
-//     const {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     } = body;
+// export const validateStoreVendorExperienceRequest = (body: unknown): VendorExperienceRequestDTO => {
+//     return validateWithSchema<VendorExperienceRequestDTO>(storeVendorExperienceSchema, body);
+// }
 
-//     return {
-//         simrs_type,
-//         vendor_id,
-//         status,
-//         contract_start_date,
-//         contract_expired_date,
-//         contract_value_min,
-//         contract_value_max,
-//         positive_notes,
-//         negative_notes,
-//     };
-// };
+// export const validateUpdateVendorExperienceRequest = (body: unknown): Partial<VendorExperienceRequestDTO> => {
+//     return validateWithSchema<Partial<VendorExperienceRequestDTO>>(updateVendorExperienceSchema, body);
+// }