Merge branch 'development'

prisma/migrations/20250908013400_update_erd_vendor_experience/migration.sql

@@ -0,0 +1,48 @@
+/*
+  Warnings:
+
+  - You are about to drop the column `tag` on the `categories` table. All the data in the column will be lost.
+  - You are about to drop the column `contract_expired_date` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `contract_start_date` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `contract_value_max` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `contract_value_min` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `negative_notes` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `positive_notes` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `simrs_type` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the column `status` on the `vendor_experiences` table. All the data in the column will be lost.
+  - You are about to drop the `category_links` table. If the table is not empty, all the data it contains will be lost.
+  - Added the required column `name` to the `categories` table without a default value. This is not possible if the table is not empty.
+  - Added the required column `user_id` to the `vendor_experiences` table without a default value. This is not possible if the table is not empty.
+
+*/
+-- DropForeignKey
+ALTER TABLE "category_links" DROP CONSTRAINT "category_links_category_id_fkey";
+
+-- AlterTable
+ALTER TABLE "categories" DROP COLUMN "tag",
+ADD COLUMN     "name" TEXT NOT NULL;
+
+-- AlterTable
+ALTER TABLE "vendor_experiences" DROP COLUMN "contract_expired_date",
+DROP COLUMN "contract_start_date",
+DROP COLUMN "contract_value_max",
+DROP COLUMN "contract_value_min",
+DROP COLUMN "negative_notes",
+DROP COLUMN "positive_notes",
+DROP COLUMN "simrs_type",
+DROP COLUMN "status",
+ADD COLUMN     "category_id" TEXT,
+ADD COLUMN     "userKeycloakId" TEXT,
+ADD COLUMN     "user_id" TEXT NOT NULL;
+
+-- DropTable
+DROP TABLE "category_links";
+
+-- AddForeignKey
+ALTER TABLE "vendor_experiences" ADD CONSTRAINT "vendor_experiences_category_id_fkey" FOREIGN KEY ("category_id") REFERENCES "categories"("id") ON DELETE SET NULL ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "vendor_experiences" ADD CONSTRAINT "vendor_experiences_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;
+
+-- AddForeignKey
+ALTER TABLE "vendor_experiences" ADD CONSTRAINT "vendor_experiences_userKeycloakId_fkey" FOREIGN KEY ("userKeycloakId") REFERENCES "keycloak_users"("id") ON DELETE SET NULL ON UPDATE CASCADE;

prisma/migrations/20250908020610_update/migration.sql

@@ -0,0 +1,11 @@
+-- DropForeignKey
+ALTER TABLE "vendor_experiences" DROP CONSTRAINT "vendor_experiences_userKeycloakId_fkey";
+
+-- DropForeignKey
+ALTER TABLE "vendor_experiences" DROP CONSTRAINT "vendor_experiences_user_id_fkey";
+
+-- AlterTable
+ALTER TABLE "vendor_experiences" ADD COLUMN     "userId" TEXT;
+
+-- AddForeignKey
+ALTER TABLE "vendor_experiences" ADD CONSTRAINT "vendor_experiences_user_id_fkey" FOREIGN KEY ("user_id") REFERENCES "keycloak_users"("id") ON DELETE RESTRICT ON UPDATE CASCADE;

prisma/migrations/20250908023150_update/migration.sql

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

prisma/migrations/20250908065231_add_field_status_archieve_in_table_category/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "categories" ADD COLUMN     "status_archieve" TEXT;

prisma/migrations/20250908065458_add_field_status_archieve_in_table_category_update_type/migration.sql

@@ -0,0 +1,9 @@
+/*
+  Warnings:
+
+  - The `status_archieve` column on the `categories` table would be dropped and recreated. This will lead to data loss if there is data in the column.
+
+*/
+-- AlterTable
+ALTER TABLE "categories" DROP COLUMN "status_archieve",
+ADD COLUMN     "status_archieve" BOOLEAN;

prisma/migrations/20250908070214_add_field_status_archieve_in_table_category_update_type_add_default/migration.sql

@@ -0,0 +1,2 @@
+-- AlterTable
+ALTER TABLE "categories" ALTER COLUMN "status_archieve" SET DEFAULT false;

prisma/migrations/20250908071236_add_field_status_archieve_in_table_category_update_type_add_default_edit/migration.sql

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

prisma/schema.prisma

@@ -67,6 +67,7 @@ model UserKeycloak {
   UserArea           UserArea[]
   Vendor             Vendor[]
   StatusHistory      StatusHistory[]
+  VendorExperience   VendorExperience[]
   CreatedVisitations ScheduleVisitation[] @relation("CreatedVisitations")
   SalesVisitations   ScheduleVisitation[] @relation("SalesVisitations")
 
@@ -181,22 +182,27 @@ model UserArea {
 // }
 
 model VendorExperience {
-  id                    String    @id @default(uuid())
-  hospital_id           String
-  vendor_id             String?
-  status                String?
-  contract_start_date   DateTime?
-  contract_expired_date DateTime?
-  contract_value_min    BigInt?
-  contract_value_max    BigInt?
-  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
-  deletedAt             DateTime?
+  id          String       @id @default(uuid())
+  hospital_id String
+  vendor_id   String?
+  category_id String?
+  user_id     String
+  content     String?      @db.Text
+  hospital    Hospital     @relation(fields: [hospital_id], references: [id])
+  vendor      Vendor?      @relation(fields: [vendor_id], references: [id])
+  category    Category?    @relation(fields: [category_id], references: [id])
+  user        UserKeycloak @relation(fields: [user_id], references: [id])
+  createdAt   DateTime     @default(now())
+  updatedAt   DateTime     @updatedAt
+  deletedAt   DateTime?
+  // status                String?
+  // contract_start_date   DateTime?
+  // contract_expired_date DateTime?
+  // contract_value_min    BigInt?
+  // contract_value_max    BigInt?
+  // positive_notes        String?   @db.Text
+  // negative_notes        String?   @db.Text
+  // simrs_type            String
 
   @@map("vendor_experiences")
 }
@@ -234,29 +240,31 @@ model StatusHistory {
 }
 
 model Category {
-  id           String         @id @default(uuid())
-  tag          String
-  description  String?        @db.Text
-  CategoryLink CategoryLink[]
-  createdAt    DateTime       @default(now())
-  updatedAt    DateTime       @updatedAt
-  deletedAt    DateTime?
+  id               String             @id @default(uuid())
+  name             String
+  description      String?            @db.Text
+  status_archive   Boolean?           @default(false)
+  // CategoryLink CategoryLink[]
+  createdAt        DateTime           @default(now())
+  updatedAt        DateTime           @updatedAt
+  deletedAt        DateTime?
+  VendorExperience VendorExperience[]
 
   @@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")
-}
+// 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")
+// }
 
 model ScheduleVisitation {
   id           String       @id @default(uuid())

prisma/seeders/DatabaseSeeder.ts

@@ -44,49 +44,49 @@ import { seedUserAreas } from './UserAreaSeeder';
 import { seedHospitals } from './HospitalSeeder';
 
 async function main(): Promise<void> {
-    await seedProvinces();
-    await seedAcehCities();
-    await seedBaliCities();
-    await seedBantenCities();
-    await seedBengkuluCities();
-    await seedDIYogyakartaCities();
-    await seedDKIJakartaCities();
-    await seedGorontaloCities();
-    await seedJambiCities();
-    await seedJawaBaratCities();
-    await seedJawaTengahCities();
-    await seedJawaTimurCities();
-    await seedKalimantanBaratCities();
-    await seedKalimantanSelatanCities();
-    await seedKalimantanTengahCities();
-    await seedKalimantanTimurCities();
-    await seedKalimantanUtaraCities();
-    await seedKepulauanBangkaBelitungCities();
-    await seedKepulauanRiauCities();
-    await seedLampungCities();
-    await seedMalukuCities();
-    await seedMalukuUtaraCities();
-    await seedNusaTenggaraBaratCities();
-    await seedNusaTenggaraTimurCities();
-    await seedPapuaCities();
-    await seedPapuaBaratCities();
-    await seedPapuaBaratDayaCities();
-    await seedPapuaPegununganCities();
-    await seedPapuaTengahCities();
-    await seedRiauCities();
-    await seedSulawesiBaratCities();
-    await seedSulawesiSelatanCities();
-    await seedSulawesiTengahCities();
-    await seedSulawesiTenggaraCities();
-    await seedSulawesiUtaraCities();
-    await seedSumateraBaratCities();
-    await seedSumateraSelatanCities();
-    await seedSumateraUtaraCities();
-    await seedPapuaSelatanCities();
-    await seedUsers();
-    // await seedVendors();
-    // await seedUserAreas();
-    // await seedHospitals();
+    // await seedProvinces();
+    // await seedAcehCities();
+    // await seedBaliCities();
+    // await seedBantenCities();
+    // await seedBengkuluCities();
+    // await seedDIYogyakartaCities();
+    // await seedDKIJakartaCities();
+    // await seedGorontaloCities();
+    // await seedJambiCities();
+    // await seedJawaBaratCities();
+    // await seedJawaTengahCities();
+    // await seedJawaTimurCities();
+    // await seedKalimantanBaratCities();
+    // await seedKalimantanSelatanCities();
+    // await seedKalimantanTengahCities();
+    // await seedKalimantanTimurCities();
+    // await seedKalimantanUtaraCities();
+    // await seedKepulauanBangkaBelitungCities();
+    // await seedKepulauanRiauCities();
+    // await seedLampungCities();
+    // await seedMalukuCities();
+    // await seedMalukuUtaraCities();
+    // await seedNusaTenggaraBaratCities();
+    // await seedNusaTenggaraTimurCities();
+    // await seedPapuaCities();
+    // await seedPapuaBaratCities();
+    // await seedPapuaBaratDayaCities();
+    // await seedPapuaPegununganCities();
+    // await seedPapuaTengahCities();
+    // await seedRiauCities();
+    // await seedSulawesiBaratCities();
+    // await seedSulawesiSelatanCities();
+    // await seedSulawesiTengahCities();
+    // await seedSulawesiTenggaraCities();
+    // await seedSulawesiUtaraCities();
+    // await seedSumateraBaratCities();
+    // await seedSumateraSelatanCities();
+    // await seedSumateraUtaraCities();
+    // await seedPapuaSelatanCities();
+    // await seedUsers();
+    await seedVendors();
+    await seedUserAreas();
+    await seedHospitals();
 }
 
 main()

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: '00c7e427-cbb7-408c-af44-e04747fd61fd' } });
-        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: 'd27994a4-07b9-4ea8-bd62-3d6c51afed0e' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '1d750cae-45ac-4aff-b20c-d2c5e54185e1' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '5064d1f3-74fc-42bd-bd85-9842eed60ac2' } });
 
         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: '00c7e427-cbb7-408c-af44-e04747fd61fd' } });
-        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: 'd27994a4-07b9-4ea8-bd62-3d6c51afed0e' } });
+        const sales1 = await prisma.userKeycloak.findFirst({ where: { id: '1d750cae-45ac-4aff-b20c-d2c5e54185e1' } });
+        const sales2 = await prisma.userKeycloak.findFirst({ where: { id: '5064d1f3-74fc-42bd-bd85-9842eed60ac2' } });
 
         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: '06ccc7a6-9f6d-437f-9e1f-501a36077796',
+                id: '6471416f-e24e-4d27-815a-9f12a1344e18',
             },
         });
 

src/controllers/admin/CategoryController.ts

@@ -2,18 +2,20 @@ 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 { validateCategoryStoreRequest, validateCategoryUpdateRequest } 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';
+// 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 filter = req.query.filter as 'archive' | 'all' | undefined;
+        const usage = req.query.usage as 'unused' | 'used' | undefined;
 
         const { categories, total } = await CategoryService.getAllCategoryService({
-            page, limit, search, sortBy, orderBy
+            page, limit, search, sortBy, orderBy, filter, usage
         });
 
         return CategoryCollection(req, res, categories, total, page, limit, 'Category data successfully retrieved');
@@ -63,29 +65,11 @@ export const deleteCategory = async (req: Request, res: Response): Promise<Respo
     }
 };
 
-export const showUseCategory = async (req: Request, res: Response): Promise<Response> => {
+export const archiveCategory = 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);
+        const id = req.params.id;
+        await CategoryService.archiveCategoryService(id, req as CustomRequest);
+        return messageSuccessResponse(res, 'Success archive category');
     } catch (err) {
         return errorResponse(res, err);
     }

src/controllers/admin/VendorExperienceController.ts

@@ -9,10 +9,10 @@ import { CustomRequest } from '../../types/token/CustomRequest';
 
 export const getAllVendorExperience = async (req: Request, res: Response): Promise<Response> => {
     try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+        const { page, limit, search, sortBy, orderBy, category_id } = PaginationParam(req, ['category_id']);
 
         const { vendor_experiences, total } = await VendorExperienceService.getAllVendorExperienceService(
-            { page, limit, search, sortBy, orderBy },
+            { page, limit, search, sortBy, orderBy, category_id },
             req
         );
 
@@ -58,65 +58,4 @@ export const deleteVendorExperience = async (req: Request, res: Response): Promi
     } catch (err) {
         return errorResponse(res, err);
     }
-};
-
-
-// const { VendorExperienceCollection } = require('../../resources/admin/vendor_experience/VendorExperienceCollection.js');
-// const { VendorExperienceResource } = require('../../resources/admin/vendor_experience/VendorExperienceResource.js');
-// const vendorHistoryService = require('../../services/admin/VendorExperienceService.js');
-// const { PaginationParam } = require('../../utils/PaginationParams.js');
-// const { errorResponse, messageSuccessResponse } = require('../../utils/Response.js');
-// const { validateStoreVendorHistoryRequest, validateUpdateVendorHistoryRequest } = require('../../validators/admin/vendor_experience/VendorExperienceValidators.js');
-
-// exports.getAllVendorHistory = async (req, res) => {
-//     try {
-//         const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
-
-//         const { vendor_histories, total } = await vendorHistoryService.getAllVendorHistoryService({
-//             page, limit, search, sortBy, orderBy
-//         }, req);
-
-//         return VendorExperienceCollection(req, res, vendor_histories, total, page, limit, 'Vendor experience successfully retrieved');
-
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.showVendorHistory = async (req, res) => {
-//     try {
-//         const data = await vendorHistoryService.showVendorHistoryService(req);
-//         return VendorExperienceResource(res, data, 'Success show vendor experience');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.storeVendorHistory = async (req, res) => {
-//     try {
-//         const validatedData = validateStoreVendorHistoryRequest(req.body);
-//         await vendorHistoryService.storeVendorHistoryService(validatedData, req);
-//         return messageSuccessResponse(res, 'Success added vendor experience', 201);
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.updateVendorHistory = async (req, res) => {
-//     try {
-//         const validatedData = validateUpdateVendorHistoryRequest(req.body);
-//         await vendorHistoryService.updateVendorHistoryService(validatedData, req);
-//         return messageSuccessResponse(res, 'Success update vendor experience');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.deleteVendorHistory = async (req, res) => {
-//     try {
-//         await vendorHistoryService.deleteVendorHistoryService(req);
-//         return messageSuccessResponse(res, 'Success delete vendor experience');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
+};

src/controllers/sales/HospitalController.ts

@@ -54,55 +54,4 @@ export const showHospital = async (req: Request, res: Response): Promise<Respons
     } catch (err) {
         return errorResponse(res, err);
     }
-};
-
-
-// const { HospitalCollection } = require("../../resources/sales/hospital/HospitalCollection.js");
-// const { HospitalResource } = require("../../resources/sales/hospital/HospitalResource.js");
-// const { getAllHospitalByAreaService, storeHospitalService, updateHospitalService, showHospitalService } = require("../../services/sales/HospitalService");
-// const { PaginationParam } = require("../../utils/PaginationParams");
-// const { errorResponse, messageSuccessResponse } = require("../../utils/Response");
-// const { validateStoreHospitalRequest, validateUpdateHospitalRequest } = require('../../validators/admin/hospital/HospitalValidators.js');
-
-// exports.getAllHospitalByArea = 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 getAllHospitalByAreaService({ page, limit, search, sortBy, orderBy, province, city, type, ownership, progress_status }, req);
-
-//         return HospitalCollection({ req, res, data: hospitals, total, page, limit, message: 'Hospital data successfully retrieved' });
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
-
-// exports.storeHospital = async (req, res) => {
-//     try {
-//         const validatedData = validateStoreHospitalRequest(req.body);
-//         await 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 updateHospitalService(validatedData, id, req);
-//         return messageSuccessResponse(res, 'Success update hospital');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// }
-
-// exports.showHospital = async (req, res) => {
-//     try {
-//         const id = req.params.id;
-//         const { hospital } = await showHospitalService(id);
-//         return HospitalResource(res, hospital, 'Success show hospital');
-//     } catch (err) {
-//         return errorResponse(res, err);
-//     }
-// };
+};

src/controllers/sales/VendorExperienceController.ts

@@ -9,10 +9,10 @@ import { CustomRequest } from '../../types/token/CustomRequest';
 
 export const getAllVendorExperience = async (req: Request, res: Response): Promise<Response> => {
     try {
-        const { page, limit, search, sortBy, orderBy } = PaginationParam(req);
+        const { page, limit, search, sortBy, orderBy, category_id } = PaginationParam(req, ['category_id']);
 
         const { vendor_experiences, total } = await VendorExperienceService.getAllVendorExperienceService(
-            { page, limit, search, sortBy, orderBy },
+            { page, limit, search, sortBy, orderBy, category_id },
             req as CustomRequest
         );
 

src/repository/admin/CategoryRepository.ts

@@ -8,12 +8,12 @@ interface FindAllParams {
     orderBy?: Prisma.CategoryOrderByWithRelationInput;
 }
 
-interface FindAllCategoryLinkParams {
-    skip?: number;
-    take?: number;
-    where?: Prisma.CategoryLinkWhereInput;
-    orderBy?: Prisma.CategoryLinkOrderByWithRelationInput;
-}
+// interface FindAllCategoryLinkParams {
+//     skip?: number;
+//     take?: number;
+//     where?: Prisma.CategoryLinkWhereInput;
+//     orderBy?: Prisma.CategoryLinkOrderByWithRelationInput;
+// }
 
 const CategoryRepository = {
     findAll: async ({ skip, take, where, orderBy }: FindAllParams) => {
@@ -24,13 +24,13 @@ const CategoryRepository = {
             orderBy,
             select: {
                 id: true,
-                tag: true,
+                name: true,
                 description: true,
                 createdAt: true,
                 updatedAt: true,
                 _count: {
                     select: {
-                        CategoryLink: {
+                        VendorExperience: {
                             where: {
                                 deletedAt: null,
                             },
@@ -44,7 +44,7 @@ const CategoryRepository = {
             const { _count, ...rest } = v;
             return {
                 ...rest,
-                count_use_tags: _count.CategoryLink || 0,
+                count_use_category: _count.VendorExperience || 0,
             };
         });
 
@@ -56,43 +56,44 @@ const CategoryRepository = {
     },
 
     findById: async (id: string) => {
-        const category = await prisma.category.findFirst({
+        return await prisma.category.findFirst({
             where: {
                 id,
                 deletedAt: null,
             },
             select: {
                 id: true,
-                tag: true,
+                name: true,
                 description: true,
+                status_archive: true,
                 createdAt: true,
                 updatedAt: true,
-                _count: {
-                    select: {
-                        CategoryLink: {
-                            where: {
-                                deletedAt: null,
-                            },
-                        },
-                    },
-                },
+                // _count: {
+                //     select: {
+                //         CategoryLink: {
+                //             where: {
+                //                 deletedAt: null,
+                //             },
+                //         },
+                //     },
+                // },
             },
         });
 
-        if (!category) return null;
+        // if (!category) return null;
 
-        const { _count, ...rest } = category;
-        return {
-            ...rest,
-            count_use: _count.CategoryLink || 0,
-        };
+        // const { _count, ...rest } = category;
+        // return {
+        //     ...rest,
+        //     count_use: _count.CategoryLink || 0,
+        // };
     },
 
-    findByTag: async (tag: string) => {
+    findByName: async (name: string) => {
         return prisma.category.findFirst({
             where: {
-                tag: {
-                    equals: tag,
+                name: {
+                    equals: name,
                     mode: "insensitive",
                 },
                 deletedAt: null,
@@ -111,41 +112,41 @@ const CategoryRepository = {
         });
     },
 
-    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 });
-    },
+    // 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/repository/admin/HospitalRepository.ts

@@ -39,7 +39,7 @@ const HospitalRepository = {
                 user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
-                        status: 'active',
+                        // status: 'active',
                         deletedAt: null,
                     },
                     select: {
@@ -101,7 +101,7 @@ const HospitalRepository = {
                 user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
-                        status: 'active',
+                        // status: 'active',
                         deletedAt: null,
                     },
                     take: 1,

src/repository/admin/ScheduleVisitationRepository.ts

@@ -92,15 +92,34 @@ const ScheduleVisitationRepository = {
                             },
                         },
                         vendor_experiences: {
-                            where: { status: "active", deletedAt: null },
+                            where: {
+                                // status: "active",
+                                deletedAt: null
+                            },
                             select: {
                                 id: true,
                                 vendor: {
-                                    select: { id: true, name: true }
+                                    select: {
+                                        id: true,
+                                        name: true
+                                    }
+                                },
+                                user: {
+                                    select: {
+                                        id: true,
+                                        fullname: true
+                                    }
+                                },
+                                category: {
+                                    select: {
+                                        id: true,
+                                        name: true,
+                                    }
                                 },
-                                contract_start_date: true,
-                                contract_expired_date: true,
-                                simrs_type: true,
+                                content: true
+                                // contract_start_date: true,
+                                // contract_expired_date: true,
+                                // simrs_type: true,
                             }
                         },
                         executives_histories: {

src/repository/admin/VendorExperienceRepository.ts

@@ -1,4 +1,5 @@
 import { PrismaClient, Prisma } from '@prisma/client';
+import tr from 'zod/v4/locales/tr.cjs';
 const prisma = new PrismaClient();
 
 interface FindAllParams {
@@ -17,6 +18,7 @@ const VendorExperienceRepository = {
             orderBy,
             select: {
                 id: true,
+                content: true,
                 vendor: {
                     select: {
                         id: true,
@@ -28,14 +30,29 @@ const VendorExperienceRepository = {
                         created_by: true,
                     },
                 },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
+                // category_id: true,
+                category: {
+                    select: {
+                        id: true,
+                        name: true,
+                        description: true,
+                    },
+                },
+                // user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                // status: true,
+                // simrs_type: true,
+                // contract_value_min: true,
+                // contract_value_max: true,
+                // contract_start_date: true,
+                // contract_expired_date: true,
+                // positive_notes: true,
+                // negative_notes: true,
                 createdAt: true,
                 updatedAt: true,
             },
@@ -54,7 +71,8 @@ const VendorExperienceRepository = {
             },
             select: {
                 id: true,
-                vendor_id: true,
+                content: true,
+                // vendor_id: true,
                 vendor: {
                     select: {
                         id: true,
@@ -66,14 +84,29 @@ const VendorExperienceRepository = {
                         created_by: true,
                     },
                 },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
+                // category_id: true,
+                category: {
+                    select: {
+                        id: true,
+                        name: true,
+                        description: true,
+                    },
+                },
+                // user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                // status: true,
+                // simrs_type: true,
+                // contract_value_min: true,
+                // contract_value_max: true,
+                // contract_start_date: true,
+                // contract_expired_date: true,
+                // positive_notes: true,
+                // negative_notes: true,
                 createdAt: true,
                 updatedAt: true,
             },
@@ -92,147 +125,4 @@ const VendorExperienceRepository = {
     },
 };
 
-export default VendorExperienceRepository;
-
-// const prisma = require('../../prisma/PrismaClient.js');
-
-// const VendorExperienceRepository = {
-//     findAll: async ({ skip, take, where, orderBy }) => {
-//         return prisma.vendorExperience.findMany({
-//             where,
-//             skip,
-//             take,
-//             orderBy,
-//             select: {
-//                 id: true,
-//                 // hospital: {
-//                 //     select: {
-//                 //         id: true,
-//                 //         name: true,
-//                 //         hospital_code: true,
-//                 //         type: true,
-//                 //         ownership: true,
-//                 //         province: {
-//                 //             select: {
-//                 //                 id: true,
-//                 //                 name: true
-//                 //             }
-//                 //         },
-//                 //         city: {
-//                 //             select: {
-//                 //                 id: true,
-//                 //                 name: true
-//                 //             }
-//                 //         },
-//                 //         address: true,
-//                 //         simrs_type: true,
-//                 //         contact: true,
-//                 //         image: true,
-//                 //         progress_status: true,
-//                 //         note: true,
-//                 //         created_by: true
-//                 //     }
-//                 // },
-//                 vendor: {
-//                     select: {
-//                         id: true,
-//                         name: true,
-//                         name_pt: true,
-//                         strengths: true,
-//                         weaknesses: true,
-//                         website: true,
-//                         created_by: true,
-//                     }
-//                 },
-//                 status: true,
-//                 simrs_type: true,
-//                 contract_value_min: true,
-//                 contract_value_max: true,
-//                 contract_start_date: true,
-//                 contract_expired_date: true,
-//                 positive_notes: true,
-//                 negative_notes: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//             },
-//         });
-//     },
-
-//     countAll: async (where) => {
-//         return prisma.vendorExperience.count({ where });
-//     },
-
-//     findById: async (id) => {
-//         return prisma.vendorExperience.findFirst({
-//             where: {
-//                 id,
-//                 deletedAt: null
-//             },
-//             select: {
-//                 id: true,
-//                 // hospital: {
-//                 //     select: {
-//                 //         id: true,
-//                 //         name: true,
-//                 //         hospital_code: true,
-//                 //         type: true,
-//                 //         ownership: true,
-//                 //         province: {
-//                 //             select: {
-//                 //                 id: true,
-//                 //                 name: true
-//                 //             }
-//                 //         },
-//                 //         city: {
-//                 //             select: {
-//                 //                 id: true,
-//                 //                 name: true
-//                 //             }
-//                 //         },
-//                 //         address: true,
-//                 //         simrs_type: true,
-//                 //         contact: true,
-//                 //         image: true,
-//                 //         progress_status: true,
-//                 //         note: true,
-//                 //         created_by: true
-//                 //     }
-//                 // },
-//                 vendor: {
-//                     select: {
-//                         id: true,
-//                         name: true,
-//                         name_pt: true,
-//                         strengths: true,
-//                         weaknesses: true,
-//                         website: true,
-//                         created_by: true,
-//                     }
-//                 },
-//                 status: true,
-//                 simrs_type: true,
-//                 contract_value_min: true,
-//                 contract_value_max: true,
-//                 contract_start_date: true,
-//                 contract_expired_date: true,
-//                 positive_notes: true,
-//                 negative_notes: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//             },
-//         });
-//     },
-
-//     create: async (data) => {
-//         return prisma.vendorExperience.create({ data });
-//     },
-
-//     update: async (id, data) => {
-//         return prisma.vendorExperience.update({
-//             where: { id },
-//             data
-//         });
-//     },
-// };
-
-// module.exports = VendorExperienceRepository;
+export default VendorExperienceRepository;

src/repository/admin/VendorRepository.ts

@@ -29,7 +29,7 @@ const VendorRepository = {
                         vendor_experiences: {
                             where: {
                                 deletedAt: null,
-                                status: "active"
+                                // status: "active"
                             },
                         },
                     },
@@ -73,6 +73,7 @@ const VendorRepository = {
                         vendor_experiences: {
                             where: {
                                 deletedAt: null,
+                                // status: "active"
                             },
                         },
                     },

src/repository/sales/HospitalRepository.ts

@@ -37,7 +37,7 @@ const HospitalRepository = {
                 user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
-                        status: 'active',
+                        // status: 'active',
                         deletedAt: null,
                     },
                     select: {
@@ -101,7 +101,7 @@ const HospitalRepository = {
                 user: { select: { id: true, fullname: true } },
                 vendor_experiences: {
                     where: {
-                        status: 'active',
+                        // status: 'active',
                         deletedAt: null,
                     },
                     take: 1,
@@ -138,139 +138,4 @@ const HospitalRepository = {
     },
 };
 
-export default HospitalRepository;
-
-
-// const prisma = require('../../prisma/PrismaClient.js');
-
-// const HospitalRepository = {
-//     findAll: async ({ skip, take, where, orderBy }) => {
-//         const hospitalsRaw = await prisma.hospital.findMany({
-//             where,
-//             skip,
-//             take,
-//             orderBy,
-//             select: {
-//                 id: true,
-//                 name: true,
-//                 hospital_code: true,
-//                 type: true,
-//                 ownership: true,
-//                 province: { select: { id: true, name: true } },
-//                 city: { select: { id: true, name: true } },
-//                 address: true,
-//                 contact: true,
-//                 image: true,
-//                 progress_status: true,
-//                 note: true,
-//                 latitude: true,
-//                 longitude: true,
-//                 gmaps_url: true,
-//                 created_by: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//                 user: { select: { id: true, fullname: true } },
-//                 vendor_experiences: {
-//                     where: {
-//                         status: "active",
-//                         deletedAt: null
-//                     },
-//                     select: {
-//                         vendor: {
-//                             select: {
-//                                 id: true,
-//                                 name: true,
-//                                 name_pt: true,
-//                                 strengths: true,
-//                                 weaknesses: true,
-//                                 website: true,
-//                             }
-//                         }
-//                     }
-//                 }
-//             }
-//         });
-
-//         return hospitalsRaw.map(hospital => {
-//             const { vendor_experiences, ...rest } = hospital;
-//             return {
-//                 ...rest,
-//                 vendor: vendor_experiences?.[0]?.vendor || null
-//             };
-//         });
-//     },
-
-//     countAll: async (where) => {
-//         return prisma.hospital.count({ where });
-//     },
-
-//     create: async (data) => {
-//         return prisma.hospital.create({ data });
-//     },
-
-//     findById: async (id) => {
-//         const hospitalRaw = await prisma.hospital.findFirst({
-//             where: {
-//                 id,
-//                 deletedAt: null
-//             },
-//             select: {
-//                 id: true,
-//                 name: true,
-//                 hospital_code: true,
-//                 type: true,
-//                 ownership: true,
-//                 province: { select: { id: true, name: true } },
-//                 city: { select: { id: true, name: true } },
-//                 address: true,
-//                 contact: true,
-//                 image: true,
-//                 progress_status: true,
-//                 note: true,
-//                 latitude: true,
-//                 longitude: true,
-//                 gmaps_url: true,
-//                 created_by: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//                 user: { select: { id: true, fullname: true } },
-//                 vendor_experiences: {
-//                     where: {
-//                         status: "active",
-//                         deletedAt: null
-//                     },
-//                     take: 1,
-//                     select: {
-//                         vendor: {
-//                             select: {
-//                                 id: true,
-//                                 name: true,
-//                                 name_pt: true,
-//                                 strengths: true,
-//                                 weaknesses: true,
-//                                 website: true,
-//                             }
-//                         }
-//                     }
-//                 }
-//             }
-//         });
-
-//         if (!hospitalRaw) return null;
-
-//         const { vendor_experiences, ...rest } = hospitalRaw;
-//         return {
-//             ...rest,
-//             vendor: vendor_experiences?.[0]?.vendor || null
-//         };
-//     },
-
-//     update: async (id, data) => {
-//         return prisma.hospital.update({
-//             where: { id },
-//             data
-//         });
-//     },
-// };
-
-// module.exports = HospitalRepository;
+export default HospitalRepository;

src/repository/sales/ScheduleVisitationRepository.ts

@@ -93,15 +93,25 @@ const ScheduleVisitationRepository = {
                             },
                         },
                         vendor_experiences: {
-                            where: { status: "active", deletedAt: null },
+                            where: {
+                                // status: "active",
+                                deletedAt: null
+                            },
                             select: {
                                 id: true,
                                 vendor: {
                                     select: { id: true, name: true }
                                 },
-                                contract_start_date: true,
-                                contract_expired_date: true,
-                                simrs_type: true,
+                                category: {
+                                    select: { id: true, name: true }
+                                },
+                                user: {
+                                    select: { id: true, fullname: true }
+                                },
+                                content: true
+                                // contract_start_date: true,
+                                // contract_expired_date: true,
+                                // simrs_type: true,
                             }
                         },
                         executives_histories: {

src/repository/sales/VendorExperienceRepository.ts

@@ -17,6 +17,7 @@ const VendorExperienceRepository = {
             orderBy,
             select: {
                 id: true,
+                content: true,
                 vendor: {
                     select: {
                         id: true,
@@ -28,14 +29,29 @@ const VendorExperienceRepository = {
                         created_by: true,
                     },
                 },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
+                // category_id: true,
+                category: {
+                    select: {
+                        id: true,
+                        name: true,
+                        description: true,
+                    },
+                },
+                // user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                // status: true,
+                // simrs_type: true,
+                // contract_value_min: true,
+                // contract_value_max: true,
+                // contract_start_date: true,
+                // contract_expired_date: true,
+                // positive_notes: true,
+                // negative_notes: true,
                 createdAt: true,
                 updatedAt: true,
             },
@@ -54,7 +70,7 @@ const VendorExperienceRepository = {
             },
             select: {
                 id: true,
-                vendor_id: true,
+                content: true,
                 vendor: {
                     select: {
                         id: true,
@@ -66,14 +82,29 @@ const VendorExperienceRepository = {
                         created_by: true,
                     },
                 },
-                status: true,
-                simrs_type: true,
-                contract_value_min: true,
-                contract_value_max: true,
-                contract_start_date: true,
-                contract_expired_date: true,
-                positive_notes: true,
-                negative_notes: true,
+                // category_id: true,
+                category: {
+                    select: {
+                        id: true,
+                        name: true,
+                        description: true,
+                    },
+                },
+                // user_id: true,
+                user: {
+                    select: {
+                        id: true,
+                        fullname: true,
+                    },
+                },
+                // status: true,
+                // simrs_type: true,
+                // contract_value_min: true,
+                // contract_value_max: true,
+                // contract_start_date: true,
+                // contract_expired_date: true,
+                // positive_notes: true,
+                // negative_notes: true,
                 createdAt: true,
                 updatedAt: true,
             },
@@ -92,91 +123,4 @@ const VendorExperienceRepository = {
     },
 };
 
-export default VendorExperienceRepository;
-
-// const prisma = require('../../prisma/PrismaClient.js');
-
-// const VendorExperienceRepository = {
-//     findAll: async ({ skip, take, where, orderBy }) => {
-//         return prisma.vendorExperience.findMany({
-//             where,
-//             skip,
-//             take,
-//             orderBy,
-//             select: {
-//                 id: true,
-//                 vendor: {
-//                     select: {
-//                         id: true,
-//                         name: true,
-//                         name_pt: true,
-//                         strengths: true,
-//                         weaknesses: true,
-//                         website: true,
-//                         created_by: true,
-//                     }
-//                 },
-//                 status: true,
-//                 simrs_type: true,
-//                 contract_value_min: true,
-//                 contract_value_max: true,
-//                 contract_start_date: true,
-//                 contract_expired_date: true,
-//                 positive_notes: true,
-//                 negative_notes: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//             },
-//         });
-//     },
-
-//     countAll: async (where) => {
-//         return prisma.vendorExperience.count({ where });
-//     },
-
-//     findById: async (id) => {
-//         return prisma.vendorExperience.findFirst({
-//             where: {
-//                 id,
-//                 deletedAt: null
-//             },
-//             select: {
-//                 id: true,
-//                 vendor: {
-//                     select: {
-//                         id: true,
-//                         name: true,
-//                         name_pt: true,
-//                         strengths: true,
-//                         weaknesses: true,
-//                         website: true,
-//                         created_by: true,
-//                     }
-//                 },
-//                 status: true,
-//                 simrs_type: true,
-//                 contract_value_min: true,
-//                 contract_value_max: true,
-//                 contract_start_date: true,
-//                 contract_expired_date: true,
-//                 positive_notes: true,
-//                 negative_notes: true,
-//                 createdAt: true,
-//                 updatedAt: true,
-//             },
-//         });
-//     },
-
-//     create: async (data) => {
-//         return prisma.vendorExperience.create({ data });
-//     },
-
-//     update: async (id, data) => {
-//         return prisma.vendorExperience.update({
-//             where: { id },
-//             data
-//         });
-//     },
-// };
-
-// module.exports = VendorExperienceRepository;
+export default VendorExperienceRepository;

src/resources/admin/hospital/HospitalCollection.ts

@@ -14,40 +14,40 @@ export const HospitalCollection = async (req: Request, res: Response, data: Hosp
     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,
-        },
-    });
+    // 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: [] });
-    }
+    // 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;
+    // 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);
-        }
-    }
+    //     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);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...rest,
-            note_tags: tags?.note ?? [],
+            // note_tags: tags?.note ?? [],
         });
     });
 

src/resources/admin/hospital/HospitalResource.ts

@@ -10,26 +10,26 @@ const formatItem = (item: HospitalDTO) => ({
 });
 
 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 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 ?? '');
+    // const note_tags = tags
+    //     .filter(t => t.source_type === 'hospital_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
     const { created_by, ...cleanedData } = data;
 
     const formatted = {
         ...formatItem(cleanedData),
-        note_tags,
+        // note_tags,
     };
 
     return res.status(200).json({

src/resources/admin/schedule_visitation/ScheduleVisitationResource.ts

@@ -10,8 +10,8 @@ const formatItem = (item: ShowScheduleVisitationDTO) => ({
         ...item.hospital,
         vendor_experiences: item.hospital.vendor_experiences.map((vendor) => ({
             ...vendor,
-            contract_start_date: formatDateOnly(vendor.contract_start_date),
-            contract_expired_date: formatDateOnly(vendor.contract_expired_date),
+            // contract_start_date: formatDateOnly(vendor.contract_start_date),
+            // contract_expired_date: formatDateOnly(vendor.contract_expired_date),
         })),
         executives_histories: item.hospital.executives_histories.map((exec) => ({
             ...exec,

src/resources/admin/status_history/StatusHistoryCollection.ts

@@ -14,40 +14,40 @@ export const StatusHistoryCollection = async (req: Request, res: Response, 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: { in: ['status_history_notes'] },
-            deletedAt: null,
-        },
-        include: {
-            Category: true,
-        },
-    });
+    // 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: [] });
-    }
+    // // 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;
+    // 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);
-        }
-    }
+    //     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);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...item,
-            note_tags: tags?.note ?? [],
+            // note_tags: tags?.note ?? [],
         });
     });
 

src/resources/admin/vendor/VendorCollection.ts

@@ -14,16 +14,16 @@ export const VendorCollection = async (req: Request, res: Response, data: Vendor
     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,
-        },
-    });
+    // 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[] }>();
@@ -31,18 +31,18 @@ export const VendorCollection = async (req: Request, res: Response, data: Vendor
         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;
+    // 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);
-        }
-    }
+    //     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 => {

src/resources/admin/vendor/VendorResource.ts

@@ -4,24 +4,24 @@ 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 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 strengths_tags = tags
+    //     .filter(t => t.source_type === 'vendor_strength_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
-    const weaknesses_tags = tags
-        .filter(t => t.source_type === 'vendor_weaknesses_notes')
-        .map(t => t.Category?.tag ?? '');
+    // const weaknesses_tags = tags
+    //     .filter(t => t.source_type === 'vendor_weaknesses_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
     const formatted = {
         ...data,
@@ -29,8 +29,8 @@ export const VendorResource = async (res: Response, data: VendorDTO, message: st
         updatedAt: formatISOWithoutTimezone(data.updatedAt),
         strengths: data.strengths,
         weaknesses: data.weaknesses,
-        strengths_tags,
-        weaknesses_tags,
+        // strengths_tags,
+        // weaknesses_tags,
     };
 
     return res.status(200).json({

src/resources/admin/vendor_experience/VendorExperienceCollection.ts

@@ -6,10 +6,10 @@ import prisma from '../../../prisma/PrismaClient';
 
 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),
+    // 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),
 });
@@ -26,43 +26,43 @@ export const VendorExperienceCollection = async (
     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,
-        },
-    });
+    // 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: [] });
-    }
+    // 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;
+    // 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);
-        }
-    }
+    //     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);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...item,
-            positive_notes_tags: tags?.positive ?? [],
-            negative_notes_tags: tags?.negative ?? [],
+            // positive_notes_tags: tags?.positive ?? [],
+            // negative_notes_tags: tags?.negative ?? [],
         });
     });
 

src/resources/admin/vendor_experience/VendorExperienceResource.ts

@@ -1,29 +1,29 @@
 import { Response } from 'express';
-import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { 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 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 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 ?? '');
+    // const negative_notes_tags = tags
+    //     .filter(t => t.source_type === 'vendor_experience_negative_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
-    const { vendor_id, ...restData } = data;
+    // const { vendor_id, ...restData } = data;
+    const restData = data;
 
     const formatted = {
         ...restData,
@@ -38,12 +38,25 @@ export const VendorExperienceResource = async (res: Response, data: VendorExperi
                 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: 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,
+        category: data.category
+            ? {
+                id: data.category.id,
+                name: data.category.name,
+                description: data.category.description,
+            }
+            : null,
+        user: data.user
+            ? {
+                id: data.user.id,
+                name: data.user.fullname,
+            } : null,
+        content: data.content,
+        // contract_start_date: formatDateOnly(data.contract_start_date),
+        // contract_expired_date: formatDateOnly(data.contract_expired_date),
+        // 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),
     };

src/resources/sales/hospital/HospitalCollection.ts

@@ -27,41 +27,41 @@ export const HospitalCollection = async ({
     limit: number;
     message?: string;
 }) => {
-    const ids = data.map(item => item.id);
+    // 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,
-        },
-    });
+    // 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: [] });
-    }
+    // // 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;
+    // 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);
-    }
+    //     current.note.push(categoryTag);
+    // }
 
     const formattedData = data.map(item => {
         const { created_by, ...rest } = item;
-        const tags = tagMap.get(item.id);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...rest,
-            note_tags: tags?.note ?? [],
+            // note_tags: tags?.note ?? [],
         });
     });
 

src/resources/sales/hospital/HospitalResource.ts

@@ -10,26 +10,26 @@ const formatItem = (item: HospitalDTO) => ({
 });
 
 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 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 ?? '');
+    // const note_tags = tags
+    //     .filter(t => t.source_type === 'hospital_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
     const { created_by, ...cleanedData } = data;
 
     const formatted = {
         ...formatItem(cleanedData),
-        note_tags,
+        // note_tags,
     };
 
     return res.status(200).json({

src/resources/sales/schedule_visitation/ScheduleVisitationResource.ts

@@ -10,8 +10,8 @@ const formatItem = (item: ShowScheduleVisitationDTO) => ({
         ...item.hospital,
         vendor_experiences: item.hospital.vendor_experiences.map((vendor) => ({
             ...vendor,
-            contract_start_date: formatDateOnly(vendor.contract_start_date),
-            contract_expired_date: formatDateOnly(vendor.contract_expired_date),
+            // contract_start_date: formatDateOnly(vendor.contract_start_date),
+            // contract_expired_date: formatDateOnly(vendor.contract_expired_date),
         })),
         executives_histories: item.hospital.executives_histories.map((exec) => ({
             ...exec,

src/resources/sales/status_history/StatusHistoryCollection.ts

@@ -14,40 +14,40 @@ export const StatusHistoryCollection = async (req: Request, res: Response, 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: { in: ['status_history_notes'] },
-            deletedAt: null,
-        },
-        include: {
-            Category: true,
-        },
-    });
+    // 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: [] });
-    }
+    // 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;
+    // 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);
-        }
-    }
+    //     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);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...item,
-            note_tags: tags?.note ?? [],
+            // note_tags: tags?.note ?? [],
         });
     });
 

src/resources/sales/vendor_experience/VendorExperienceCollection.ts

@@ -1,15 +1,14 @@
 import { Request, Response } from 'express';
 import { ListResponse } from '../../../utils/ListResponse';
-import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 import { VendorExperienceDTO } from '../../../types/sales/vendor_experience/VendorExperienceDTO';
-import prisma from '../../../prisma/PrismaClient';
 
 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),
+    // 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),
 });
@@ -26,43 +25,43 @@ export const VendorExperienceCollection = async (
     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,
-        },
-    });
+    // 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: [] });
-    }
+    // 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;
+    // 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);
-        }
-    }
+    //     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);
+        // const tags = tagMap.get(item.id);
         return formatItem({
             ...item,
-            positive_notes_tags: tags?.positive ?? [],
-            negative_notes_tags: tags?.negative ?? [],
+            // positive_notes_tags: tags?.positive ?? [],
+            // negative_notes_tags: tags?.negative ?? [],
         });
     });
 

src/resources/sales/vendor_experience/VendorExperienceResource.ts

@@ -1,29 +1,29 @@
 import { Response } from 'express';
-import { formatDateOnly, formatISOWithoutTimezone } from '../../../utils/FormatDate';
+import { formatISOWithoutTimezone } from '../../../utils/FormatDate';
 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 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 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 ?? '');
+    // const negative_notes_tags = tags
+    //     .filter(t => t.source_type === 'vendor_experience_negative_notes')
+    //     .map(t => t.Category?.tag ?? '');
 
-    const { vendor_id, ...restData } = data;
+    // const { vendor_id, ...restData } = data;
+    const restData = data;
 
     const formatted = {
         ...restData,
@@ -38,12 +38,25 @@ export const VendorExperienceResource = async (res: Response, data: VendorExperi
                 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: 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,
+        category: data.category
+            ? {
+                id: data.category.id,
+                name: data.category.name,
+                description: data.category.description,
+            }
+            : null,
+        user: data.user
+            ? {
+                id: data.user.id,
+                name: data.user.fullname,
+            } : null,
+        content: data.content,
+        // contract_start_date: formatDateOnly(data.contract_start_date),
+        // contract_expired_date: formatDateOnly(data.contract_expired_date),
+        // 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),
     };

src/routes/admin/CategoryRoute.ts

@@ -6,13 +6,14 @@ import checkRoles from '../../middleware/CheckRoles';
 
 const router: Router = express.Router();
 
-router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.getAllCategory);
+router.get('/', [keycloak.protect(), extractToken, checkRoles(["admin", "sales"])], 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.patch('/:id/archive', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.archiveCategory);
 
-router.get('/:id/use', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.showUseCategory);
-router.post('/merge', [keycloak.protect(), extractToken, checkRoles(["admin"])], CategoryController.mergeCategory);
+// 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/services/admin/CategoryLinkService.ts

@@ -3,58 +3,58 @@ import CategoryLinkRepository from '../../repository/admin/CategoryLinkRepositor
 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;
-};
+// 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

@@ -17,23 +17,39 @@ interface GetAllCategoryParams {
     search?: string;
     sortBy: string;
     orderBy: 'asc' | 'desc';
+    filter?: 'archive' | 'all';
+    usage?: 'unused' | 'used'
 }
 
-interface GetAllCategoryLinkParams {
-    page: number;
-    limit: number;
-    search?: string;
-    categoryId: string;
-}
-
-export const getAllCategoryService = async ({ page, limit, search, sortBy, orderBy }: GetAllCategoryParams) => {
+// interface GetAllCategoryLinkParams {
+//     page: number;
+//     limit: number;
+//     search?: string;
+//     categoryId: string;
+// }
+export const getAllCategoryService = async ({ page, limit, search, sortBy, orderBy, filter, usage }: GetAllCategoryParams) => {
     const skip = (page - 1) * limit;
 
-    const where: Prisma.CategoryWhereInput = {
-        ...SearchFilter(search, ['tag']),
+    // Default filter: only active (not archived, not deleted)
+    let where: Prisma.CategoryWhereInput = {
+        ...SearchFilter(search, ['name']),
+        status_archive: false,
         deletedAt: null,
     };
 
+    if (filter === 'archive') {
+        where = {
+            ...SearchFilter(search, ['name']),
+            status_archive: true,
+            deletedAt: null,
+        };
+    } else if (filter === 'all') {
+        where = {
+            ...SearchFilter(search, ['name']),
+            deletedAt: null, // ignore status_archive
+        };
+    }
+
     const [categories, total] = await Promise.all([
         CategoryRepository.findAll({
             skip,
@@ -43,8 +59,16 @@ export const getAllCategoryService = async ({ page, limit, search, sortBy, order
         }),
         CategoryRepository.countAll(where),
     ]);
+    
+    let filteredCategories = categories;
+
+    if (usage === 'unused') {
+        filteredCategories = categories.filter(c => c.count_use_category === 0);
+    } else if (usage === 'used') {
+        filteredCategories = categories.filter(c => c.count_use_category > 0);
+    }
 
-    return { categories, total };
+    return { categories: filteredCategories, total };
 };
 
 export const showCategoryService = async (id: string) => {
@@ -57,14 +81,14 @@ export const showCategoryService = async (id: string) => {
 };
 
 export const storeCategoryService = async (validateData: CategoryRequestDTO, req: CustomRequest) => {
-    const existingCategory = await CategoryRepository.findByTag(validateData.tag);
+    const existingCategory = await CategoryRepository.findByName(validateData.name);
     if (existingCategory && !existingCategory.deletedAt) {
-        throw new HttpException('Category with this tag already exists and may not be duplicated.', 400);
+        throw new HttpException('Category with this name already exists and may not be duplicated.', 400);
     }
 
     const data = await CategoryRepository.create(validateData);
     await createLog(req, data);
-    return data;
+    // return data;
 };
 
 export const updateCategoryService = async (validateData: CategoryRequestDTO, id: string, req: CustomRequest) => {
@@ -73,16 +97,16 @@ export const updateCategoryService = async (validateData: CategoryRequestDTO, id
         throw new HttpException('Data category not found', 404);
     }
 
-    if (validateData.tag) {
-        const existingCategory = await CategoryRepository.findByTag(validateData.tag);
+    if (validateData.name) {
+        const existingCategory = await CategoryRepository.findByName(validateData.name);
         if (existingCategory && existingCategory.id !== id) {
-            throw new HttpException('Category with this tag already exists and may not be duplicated.', 400);
+            throw new HttpException('Category with this name already exists and may not be duplicated.', 400);
         }
     }
 
     const data = await CategoryRepository.update(id, validateData);
     await updateLog(req, data);
-    return data;
+    // return data;
 };
 
 export const deleteCategoryService = async (id: string, req: CustomRequest) => {
@@ -96,108 +120,124 @@ export const deleteCategoryService = async (id: string, req: CustomRequest) => {
     });
 
     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 };
+    // return data;
 };
 
-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);
+export const archiveCategoryService = async (id: string, req: CustomRequest) => {
+    const category = await CategoryRepository.findById(id);
+    if (!category) {
+        throw new HttpException('Data category not found', 404);
     }
 
-    // Create new merged category
-    const data = await CategoryRepository.create({
-        tag: validateData.tag,
-        description: validateData.description ?? null,
-    });
-
-    await createLog(req, data);
+    const newStatus = !category.status_archive;
 
-    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(),
-        },
+    const data = await CategoryRepository.update(id, {
+        status_archive: newStatus,
     });
 
-    // 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,
-        },
-    });
+    await updateLog(req, data);
 
-    // 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() },
-                });
-            }
-        }
-    }
-};
+// 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/CityService.ts

@@ -125,78 +125,4 @@ export const deleteCityService = async (id: string, req: CustomRequest) => {
 
     await deleteLog(req, data);
     return data;
-};
-
-// const CityRepository = require('../../repository/admin/CityRepository.js');
-// const HttpException = require('../../utils/HttpException.js');
-// const { SearchFilter } = require('../../utils/SearchFilter.js');
-// const timeLocal = require('../../utils/TimeLocal.js');
-// const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
-// const ProvinceRepository = require('../../repository/admin/ProvinceRepository.js');
-// const { formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
-
-// exports.getAllCityService = async ({ page, limit, search, sortBy, orderBy }) => {
-//     const skip = (page - 1) * limit;
-
-//     const where = {
-//         ...SearchFilter(search, ['id', 'name', 'province.id']),
-//         deletedAt: null
-//     };
-
-//     const [cities, total] = await Promise.all([
-//         CityRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
-//         CityRepository.countAll(where)
-//     ]);
-
-//     return { cities, total };
-// };
-
-// exports.showCityService = async (id) => {
-//     const city = await CityRepository.findById(id);
-//     if (!city) {
-//         throw new HttpException("Data city not found", 404);
-//     }
-
-//     return city;
-// };
-
-// exports.storeCityService = async (validateData, req) => {
-//     const province = await ProvinceRepository.findById(validateData.province_id);
-//     if (!province) {
-//         throw new HttpException('Province not found', 404);
-//     }
-
-//     const data = await CityRepository.create(validateData);
-//     await createLog(req, data);
-// };
-
-// exports.updateCityService = async (validateData, id, req) => {
-//     const city = await CityRepository.findById(id);
-//     if (!city) {
-//         throw new HttpException("Data city not found", 404);
-//     }
-
-//     if (validateData.province_id) {
-//         const province = await ProvinceRepository.findById(validateData.province_id);
-//         if (!province) {
-//             throw new HttpException('Province not found', 404);
-//         }
-//     }
-
-//     const data = await CityRepository.update(id, validateData);
-//     await updateLog(req, data);
-// };
-
-// exports.deleteCityService = async (id, req) => {
-//     const city = await CityRepository.findById(id);
-
-//     if (!city) {
-//         throw new HttpException('City not found', 404);
-//     }
-
-//     const data = await CityRepository.update(id, {
-//         deletedAt: now().toDate()
-//     });
-
-//     await deleteLog(req, data);
-// };
+};

src/services/admin/HospitalService.ts

@@ -13,7 +13,7 @@ import path from 'path';
 import fs from 'fs/promises';
 import sharp from 'sharp';
 import * as XLSX from "xlsx";
-import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
+// import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 import { validateStoreHospitalRequest } from '../../validators/admin/hospital/HospitalValidators';
 
 interface PaginationParams {
@@ -172,14 +172,14 @@ export const storeHospitalService = async (validateData: HospitalRequestDTO, req
     };
 
     const data = await HospitalRepository.create(payload);
-    if (validateData.tags?.length) {
-        await storeCategoryLinkService(
-            validateData.tags,
-            'hospital_notes',
-            data.id,
-            req
-        );
-    }
+    // if (validateData.tags?.length) {
+    //     await storeCategoryLinkService(
+    //         validateData.tags,
+    //         'hospital_notes',
+    //         data.id,
+    //         req
+    //     );
+    // }
 
     await createLog(req, data);
 };
@@ -301,14 +301,14 @@ export const updateHospitalService = async (validateData: Partial<HospitalReques
     };
 
     const data = await HospitalRepository.update(id, payload);
-    if (validateData.tags?.length) {
-        await updateCategoryLinkService(
-            validateData.tags,
-            'hospital_notes',
-            id,
-            req
-        );
-    }
+    // if (validateData.tags?.length) {
+    //     await updateCategoryLinkService(
+    //         validateData.tags,
+    //         'hospital_notes',
+    //         id,
+    //         req
+    //     );
+    // }
     await updateLog(req, data);
 };
 
@@ -410,14 +410,14 @@ export const importHospitalService = async (file: Express.Multer.File, req: Cust
         const data = await HospitalRepository.create(payload);
 
         // tags kategori kalau ada
-        if (validatedData.tags?.length) {
-            await storeCategoryLinkService(
-                validatedData.tags,
-                'hospital_notes',
-                data.id,
-                req
-            );
-        }
+        // if (validatedData.tags?.length) {
+        //     await storeCategoryLinkService(
+        //         validatedData.tags,
+        //         'hospital_notes',
+        //         data.id,
+        //         req
+        //     );
+        // }
 
         await createLog(req, data);
     }

src/services/admin/StatusHistoryService.ts

@@ -5,7 +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';
+// import { storeCategoryLinkService } from './CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -95,14 +95,14 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         data: { progress_status: validateData.new_status as ProgressStatus },
     });
 
-    if (validateData.note?.tags?.length) {
-        await storeCategoryLinkService(
-            validateData.note.tags,
-            'status_history_notes',
-            data.id,
-            req
-        );
-    }
+    // if (validateData.note?.tags?.length) {
+    //     await storeCategoryLinkService(
+    //         validateData.note.tags,
+    //         'status_history_notes',
+    //         data.id,
+    //         req
+    //     );
+    // }
 
     await createLog(req, data);
 };

src/services/admin/VendorExperienceService.ts

@@ -6,7 +6,9 @@ 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';
+import { connect } from 'http2';
+import { Prisma } from '@prisma/client';
+// import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -14,20 +16,24 @@ interface PaginationParams {
     search?: string;
     sortBy: string;
     orderBy: 'asc' | 'desc';
+    category_id: string;
 }
 
-export const getAllVendorExperienceService = async ({ page, limit, search, sortBy, orderBy }: PaginationParams, req: Request) => {
+export const getAllVendorExperienceService = async ({ page, limit, search, sortBy, orderBy, category_id }: PaginationParams, req: Request) => {
     const skip = (page - 1) * limit;
+
+    const where: Prisma.VendorExperienceWhereInput = {
+        hospital_id: req.params.id,
+        // ...SearchFilter(search, ['id', 'name', 'province.id']),
+        ...(category_id ? { category_id: category_id } : {}),
+        deletedAt: null,
+    };
+
     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: any = {
-        hospital_id: req.params.id,
-        deletedAt: null
-    };
-
     const [vendor_experiences, total] = await Promise.all([
         VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
         VendorExperienceRepository.countAll(where)
@@ -51,6 +57,7 @@ export const showVendorExperienceService = async (req: Request) => {
 
 export const storeVendorExperienceService = async (validateData: VendorExperienceRequestDTO, req: CustomRequest) => {
     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);
@@ -60,92 +67,99 @@ export const storeVendorExperienceService = async (validateData: VendorExperienc
         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.category_id) {
+        const category = await prisma.category.findFirst({ where: { id: validateData.category_id } });
+        if (!category) throw new HttpException('Category not found', 404);
     }
 
-    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.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 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);
+    //     }
+    // }
+
+    // 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 = {
-        ...(validateData.vendor_id && {
-            vendor: {
-                connect: { 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?.note,
-        negative_notes: validateData.negative_notes?.note,
-        hospital: {
-            connect: { id: hospitalId }
-        },
+        content: validateData.content,
+        vendor: validateData.vendor_id
+            ? { connect: { id: validateData.vendor_id } }
+            : undefined,
+        category: validateData.category_id
+            ? { connect: { id: validateData.category_id } }
+            : undefined,
+        hospital: { connect: { id: hospitalId } },
+        user: { connect: { id: userId } },
+        // 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?.note,
+        // negative_notes: validateData.negative_notes?.note,
     };
 
     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
-        );
-    }
+    // 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);
 };
 
 export const updateVendorExperienceService = async (validateData: Partial<VendorExperienceRequestDTO>, req: CustomRequest) => {
     const id_hospital = req.params.id;
+    const id_user = req.tokenData.sub;
     const id_vendor_experience = req.params.id_vendor_experience;
 
     const hospital = await prisma.hospital.findFirst({ where: { id: id_hospital } });
@@ -159,116 +173,135 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
         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_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.category_id) {
+        const existCategory = await prisma.category.findFirst({ where: { id: validateData.category_id } });
+        if (!existCategory) throw new HttpException('Category not found', 404);
     }
 
-    if (
-        validateData.contract_expired_date &&
-        validateData.contract_expired_date <= vendorHistory.contract_start_date!
-    ) {
-        throw new HttpException('Contract expired date must be after contract start date.', 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);
-        }
-    }
-
-    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'
-            }
-        });
-    }
+    // if (validateData.user_id) {
+    //     const existUser = await prisma.userKeycloak.findFirst({ where: { id: validateData.user_id } });
+    //     if (!existUser) throw new HttpException('User 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_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!
+    // ) {
+    //     throw new HttpException('Contract expired date must be after contract start date.', 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);
+    //     }
+    // }
+
+    // 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?.note || vendorHistory.positive_notes,
-        negative_notes: validateData.negative_notes?.note || vendorHistory.negative_notes,
-        simrs_type: validateData.simrs_type,
-        vendor_id: validateData.vendor_id
+        content: validateData.content,
+        vendor: validateData.vendor_id
+            ? { connect: { id: validateData.vendor_id } }
+            : undefined,
+        category: validateData.category_id
+            ? { connect: { id: validateData.category_id } }
+            : undefined,
+        user: {
+            connect: { id: id_user }
+        },
+
+        // 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?.note || vendorHistory.positive_notes,
+        // negative_notes: validateData.negative_notes?.note || vendorHistory.negative_notes,
+        // simrs_type: validateData.simrs_type,
     };
 
     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
-        );
-    }
+    // 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) => {
@@ -286,269 +319,4 @@ export const deleteVendorExperienceService = async (req: CustomRequest) => {
     });
 
     await deleteLog(req, data);
-};
-
-// const HttpException = require('../../utils/HttpException.js');
-// const prisma = require('../../prisma/PrismaClient.js');
-// const { SearchFilter } = require('../../utils/SearchFilter.js');
-// const timeLocal = require('../../utils/TimeLocal.js');
-// const { createLog, updateLog, deleteLog } = require('../../utils/LogActivity.js');
-// const { formatDateOnly, formatISOWithoutTimezone } = require('../../utils/FormatDate.js');
-// const VendorExperienceRepository = require('../../repository/admin/VendorExperienceRepository.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);
-// };
+};

src/services/admin/VendorService.ts

@@ -8,7 +8,7 @@ import { Prisma } from '@prisma/client';
 import { VendorRequestDTO } from '../../types/admin/vendor/VendorDTO';
 import { CustomRequest } from '../../types/token/CustomRequest';
 import * as XLSX from "xlsx";
-import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
+// import { storeCategoryLinkService, updateCategoryLinkService } from './CategoryLinkService';
 import { validateStoreVendorRequest } from '../../validators/admin/vendor/VendorValidators';
 
 interface PaginationParams {
@@ -79,23 +79,23 @@ export const storeVendorService = async (validateData: VendorRequestDTO, req: Cu
     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
-        );
-    }
+    // 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);
 };
 
@@ -129,24 +129,23 @@ export const updateVendorService = async (validateData: Partial<VendorRequestDTO
     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
-        );
-    }
+    // 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) => {
@@ -188,12 +187,12 @@ export const importVendorService = async (file: Express.Multer.File, req: Custom
         const data = await VendorRepository.create(payload);
 
         // category links
-        if (validatedData.strengths?.tags?.length) {
-            await storeCategoryLinkService(validatedData.strengths.tags, "vendor_strength_notes", data.id, req);
-        }
-        if (validatedData.weaknesses?.tags?.length) {
-            await storeCategoryLinkService(validatedData.weaknesses.tags, "vendor_weaknesses_notes", data.id, req);
-        }
+        // if (validatedData.strengths?.tags?.length) {
+        //     await storeCategoryLinkService(validatedData.strengths.tags, "vendor_strength_notes", data.id, req);
+        // }
+        // if (validatedData.weaknesses?.tags?.length) {
+        //     await storeCategoryLinkService(validatedData.weaknesses.tags, "vendor_weaknesses_notes", data.id, req);
+        // }
 
         await createLog(req, data);
     }

src/services/sales/HospitalService.ts

@@ -11,7 +11,7 @@ import { HospitalRequestDTO } from '../../types/sales/hospital/HospitalDTO';
 import path from 'path';
 import fs from 'fs/promises';
 import sharp from 'sharp';
-import { storeCategoryLinkService, updateCategoryLinkService } from '../admin/CategoryLinkService';
+// import { storeCategoryLinkService, updateCategoryLinkService } from '../admin/CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -150,14 +150,14 @@ 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
-        );
-    }
+    // if (validateData.tags?.length) {
+    //     await storeCategoryLinkService(
+    //         validateData.tags,
+    //         'hospital_notes',
+    //         data.id,
+    //         req
+    //     );
+    // }
     await createLog(req, data);
 };
 
@@ -295,14 +295,14 @@ export const updateHospitalService = async (validateData: Partial<HospitalReques
     };
 
     const data = await salesHospitalRepository.update(id, payload);
-    if (validateData.tags?.length) {
-        await updateCategoryLinkService(
-            validateData.tags,
-            'hospital_notes',
-            id,
-            req
-        );
-    }
+    // if (validateData.tags?.length) {
+    //     await updateCategoryLinkService(
+    //         validateData.tags,
+    //         'hospital_notes',
+    //         id,
+    //         req
+    //     );
+    // }
     await updateLog(req, data);
 };
 

src/services/sales/StatusHistoryService.ts

@@ -4,7 +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';
+// import { storeCategoryLinkService } from '../admin/CategoryLinkService';
 
 const prisma = new PrismaClient();
 
@@ -126,14 +126,14 @@ export const storeStatusHistoryService = async (validateData: StatusHistoryReque
         data: { progress_status: validateData.new_status as ProgressStatus },
     });
 
-    if (validateData.note?.tags?.length) {
-        await storeCategoryLinkService(
-            validateData.note.tags,
-            'status_history_notes',
-            data.id,
-            req
-        );
-    }
+    // if (validateData.note?.tags?.length) {
+    //     await storeCategoryLinkService(
+    //         validateData.note.tags,
+    //         'status_history_notes',
+    //         data.id,
+    //         req
+    //     );
+    // }
 
     await createLog(req, data);
 };

src/services/sales/VendorExperienceService.ts

@@ -5,7 +5,8 @@ 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';
+import { Prisma } from '@prisma/client';
+// import { storeCategoryLinkService, updateCategoryLinkService } from '../admin/CategoryLinkService';
 
 interface PaginationParams {
     page: number;
@@ -13,10 +14,19 @@ interface PaginationParams {
     search?: string;
     sortBy: string;
     orderBy: 'asc' | 'desc';
+    category_id: string;
 }
 
-export const getAllVendorExperienceService = async ({ page, limit, search, sortBy, orderBy }: PaginationParams, req: CustomRequest) => {
+export const getAllVendorExperienceService = async ({ page, limit, search, sortBy, orderBy, category_id }: PaginationParams, req: CustomRequest) => {
     const skip = (page - 1) * limit;
+
+    const where: Prisma.VendorExperienceWhereInput = {
+        hospital_id: req.params.id,
+        // ...SearchFilter(search, ['id', 'name', 'province.id']),
+        ...(category_id ? { category_id: category_id } : {}),
+        deletedAt: null,
+    };
+
     const hospitalId = req.params.id;
 
     const hospital = await prisma.hospital.findFirst({ where: { id: hospitalId } });
@@ -38,10 +48,10 @@ export const getAllVendorExperienceService = async ({ page, limit, search, sortB
         throw new HttpException('You are not authorized to access this hospital', 403);
     }
 
-    const where: any = {
-        hospital_id: req.params.id,
-        deletedAt: null
-    };
+    // const where: any = {
+    //     hospital_id: req.params.id,
+    //     deletedAt: null
+    // };
 
     const [vendor_experiences, total] = await Promise.all([
         VendorExperienceRepository.findAll({ skip, take: limit, where, orderBy: { [sortBy]: orderBy } }),
@@ -82,6 +92,7 @@ export const showVendorExperienceService = async (req: CustomRequest) => {
 
 export const storeVendorExperienceService = async (validateData: VendorExperienceRequestDTO, req: CustomRequest) => {
     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);
@@ -107,47 +118,52 @@ export const storeVendorExperienceService = async (validateData: VendorExperienc
         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.category_id) {
+        const category = await prisma.category.findFirst({ where: { id: validateData.category_id } });
+        if (!category) throw new HttpException('Category not found', 404);
     }
 
-    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.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 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);
+    //     }
+    // }
+
+    // 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 = {
         ...(validateData.vendor_id && {
@@ -155,44 +171,53 @@ export const storeVendorExperienceService = async (validateData: VendorExperienc
                 connect: { 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?.note,
-        negative_notes: validateData.negative_notes?.note,
+        ...(validateData.category_id && {
+            category: {
+                connect: { id: validateData.category_id }
+            }
+        }),
+        content: validateData.content,
+        // 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?.note,
+        // negative_notes: validateData.negative_notes?.note,
         hospital: {
             connect: { id: hospitalId }
         },
+        user: {
+            connect: { id: userId }
+        },
     };
 
     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
-        );
-    }
+    // 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);
 };
 
 export const updateVendorExperienceService = async (validateData: Partial<VendorExperienceRequestDTO>, req: CustomRequest) => {
     const id_hospital = req.params.id;
+    const id_user = req.tokenData.sub;
     const id_vendor_experience = req.params.id_vendor_experience;
 
     const hospital = await prisma.hospital.findFirst({ where: { id: id_hospital } });
@@ -222,115 +247,133 @@ export const updateVendorExperienceService = async (validateData: Partial<Vendor
         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.category_id) {
+        const existCategory = await prisma.category.findFirst({ where: { id: validateData.category_id } });
+        if (!existCategory) throw new HttpException('Category not found', 404);
     }
 
-    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!
-    ) {
-        throw new HttpException('Contract expired date must be after contract start date.', 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);
-        }
-    }
-
-    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 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_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!
+    // ) {
+    //     throw new HttpException('Contract expired date must be after contract start date.', 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);
+    //     }
+    // }
+
+    // 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?.note,
-        negative_notes: validateData.negative_notes?.note,
-        simrs_type: validateData.simrs_type,
-        vendor_id: validateData.vendor_id
+        // 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?.note,
+        // negative_notes: validateData.negative_notes?.note,
+        // simrs_type: validateData.simrs_type,
+        content: validateData.content,
+        ...(validateData.vendor_id && {
+            vendor: {
+                connect: { id: validateData.vendor_id }
+            }
+        }),
+        ...(validateData.category_id && {
+            category: {
+                connect: { id: validateData.category_id }
+            }
+        }),
+        user: {
+            connect: { id: id_user }
+        }
     };
 
     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
-        );
-    }
+    // 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
-        );
-    }
+    // if (validateData.negative_notes?.tags?.length) {
+    //     await updateCategoryLinkService(
+    //         validateData.negative_notes.tags,
+    //         'vendor_experience_negative_notes',
+    //         id_vendor_experience,
+    //         req
+    //     );
+    // }
 
     await updateLog(req, data);
 };

src/types/admin/category/CategoryDTO.ts

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

src/types/admin/schedule_visitation/ScheduleVisitationDTO.ts

@@ -61,10 +61,22 @@ export type ShowScheduleVisitationDTO = {
 
         vendor_experiences: {
             id: string;
-            vendor: { id: string; name: string } | null;
-            contract_start_date: Date | null;
-            contract_expired_date: Date | null;
-            simrs_type: string;
+            vendor: {
+                id: string;
+                name: string;
+            } | null;
+            category: {
+                id: string;
+                name: string;
+            } | null;
+            content: string | null;
+            user: {
+                id: string;
+                fullname: string;
+            }
+            // contract_start_date: Date | null;
+            // contract_expired_date: Date | null;
+            // simrs_type: string;
         }[];
 
         executives_histories: {

src/types/admin/vendor_experience/VendorExperienceDTO.ts

@@ -1,36 +1,27 @@
 export interface VendorExperienceRequestDTO {
-    simrs_type: string;
-    vendor_id: string | null;
-    status?: string;
-    contract_start_date?: Date | null;
-    contract_expired_date?: Date | null;
-    contract_value_min?: number | null;
-    contract_value_max?: number | null;
-    positive_notes?: {
-        note: string;
-        tags: string[];
-    };
-    negative_notes?: {
-        note: string;
-        tags: string[];
-    };
+    // simrs_type: string;
+    vendor_id?: string | null;
+    category_id?: string | null;
+    content?: string | null;
+    // user_id: string;
+    // status?: string;
+    // contract_start_date?: Date | null;
+    // contract_expired_date?: Date | null;
+    // contract_value_min?: number | null;
+    // contract_value_max?: number | null;
+    // positive_notes?: {
+    //     note: string;
+    //     tags: string[];
+    // };
+    // negative_notes?: {
+    //     note: string;
+    //     tags: string[];
+    // };
 }
 
 export interface VendorExperienceDTO {
     id: string;
-    contract_start_date: Date | null;
-    contract_expired_date: Date | null;
-    contract_value_min: bigint | null;
-    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;
-    updatedAt: Date;
-    vendor_id?: string | null;
+    content: string | null;
     vendor: {
         id: string;
         name: string;
@@ -40,4 +31,28 @@ export interface VendorExperienceDTO {
         website: string | null;
         created_by: string;
     } | null;
+    category: {
+        id: string;
+        name: string;
+        description: string | null;
+    } | null;
+    user: {
+        id: string;
+        fullname: string;
+    };
+    createdAt: Date;
+    updatedAt: Date;
+    // contract_start_date: Date | null;
+    // contract_expired_date: Date | null;
+    // contract_value_min: bigint | null;
+    // 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;
+    // vendor_id?: string | null;
+    // category_id?: string | null;
+    // user_id: string
 }

src/types/sales/schedule_visitation/ScheduleVisitationDTO.ts

@@ -61,10 +61,22 @@ export type ShowScheduleVisitationDTO = {
 
         vendor_experiences: {
             id: string;
-            vendor: { id: string; name: string } | null;
-            contract_start_date: Date | null;
-            contract_expired_date: Date | null;
-            simrs_type: string;
+            vendor: {
+                id: string;
+                name: string;
+            } | null;
+            category: {
+                id: string;
+                name: string;
+            } | null;
+            content: string | null;
+            user: {
+                id: string;
+                fullname: string;
+            }
+            // contract_start_date: Date | null;
+            // contract_expired_date: Date | null;
+            // simrs_type: string;
         }[];
 
         executives_histories: {

src/types/sales/vendor_experience/VendorExperienceDTO.ts

@@ -1,36 +1,27 @@
 export interface VendorExperienceRequestDTO {
-    simrs_type: string;
-    vendor_id: string | null;
-    status?: string;
-    contract_start_date?: Date | null;
-    contract_expired_date?: Date | null;
-    contract_value_min?: number | null;
-    contract_value_max?: number | null;
-    positive_notes?: {
-        note: string;
-        tags: string[];
-    };
-    negative_notes?: {
-        note: string;
-        tags: string[];
-    };
+    vendor_id?: string | null;
+    category_id?: string | null;
+    // user_id: string;
+    content?: string | null;
+    // simrs_type: string;
+    // status?: string;
+    // contract_start_date?: Date | null;
+    // contract_expired_date?: Date | null;
+    // contract_value_min?: number | null;
+    // contract_value_max?: number | null;
+    // positive_notes?: {
+    //     note: string;
+    //     tags: string[];
+    // };
+    // negative_notes?: {
+    //     note: string;
+    //     tags: string[];
+    // };
 }
 
 export interface VendorExperienceDTO {
     id: string;
-    contract_start_date: Date | null;
-    contract_expired_date: Date | null;
-    contract_value_min: bigint | null;
-    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;
-    updatedAt: Date;
-    vendor_id?: string | null;
+    content: string | null;
     vendor: {
         id: string;
         name: string;
@@ -40,4 +31,25 @@ export interface VendorExperienceDTO {
         website: string | null;
         created_by: string;
     } | null;
+    category: {
+        id: string;
+        name: string;
+        description: string | null;
+    } | null;
+    user: {
+        id: string;
+        fullname: string;
+    };
+    createdAt: Date;
+    updatedAt: Date;
+    // simrs_type: string;
+    // contract_start_date: Date | null;
+    // contract_expired_date: Date | null;
+    // contract_value_min: bigint | null;
+    // contract_value_max: bigint | null;
+    // positive_notes: string | null;
+    // negative_notes: string | null;
+    // positive_notes_tags?: string[];
+    // negative_notes_tags?: string[];
+    // status: string | null;
 }

src/validators/admin/category/CategoryValidators.ts

@@ -3,38 +3,38 @@ 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',
+    name: Joi.string().trim().required().messages({
+        'string.empty': 'Name 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',
+    name: Joi.string().trim().optional().messages({
+        'string.empty': 'Name 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',
-        }),
+// 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(''),
-});
+//     name: Joi.string().trim().required().messages({
+//         'string.empty': 'Name is required',
+//         'any.required': 'Name is required',
+//     }),
+//     description: Joi.string().trim().optional().allow(''),
+// });
 
 export const validateCategoryStoreRequest = (body: unknown): CategoryRequestDTO => {
     return validateWithSchema<CategoryRequestDTO>(storeCategorySchema, body);
@@ -44,6 +44,6 @@ export const validateCategoryUpdateRequest = (body: unknown): CategoryRequestDTO
     return validateWithSchema<CategoryRequestDTO>(updateCategorySchema, body);
 }
 
-export const validateMergeCategoryStoreRequest = (body: unknown): MergeCategoryRequestDTO => {
-    return validateWithSchema<MergeCategoryRequestDTO>(mergeCategorySchema, body);
-};
+// export const validateMergeCategoryStoreRequest = (body: unknown): MergeCategoryRequestDTO => {
+//     return validateWithSchema<MergeCategoryRequestDTO>(mergeCategorySchema, body);
+// };

src/validators/admin/vendor_experience/VendorExperienceValidators.ts

@@ -3,47 +3,51 @@ import { validateWithSchema } from '../../ValidateSchema';
 import { VendorExperienceRequestDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
 
 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.object({
-        note: Joi.string().allow('', null),
-        tags: Joi.array().items(Joi.string()).optional().default([]),
-    }).optional().allow(null),
+    category_id: Joi.string().uuid().optional(),
+    content: Joi.string().trim().allow('', null),
+    // simrs_type: Joi.string().trim().required().messages({
+    //     'string.empty': 'Simrs type is required',
+    //     'string.base': 'Simrs type must be a string',
+    // }),
+    // 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.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),
+    // 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({
-    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.object({
-        note: Joi.string().allow('', null),
-        tags: Joi.array().items(Joi.string()).optional().default([]),
-    }).optional().allow(null),
+    category_id: Joi.string().uuid().optional(),
+    content: Joi.string().trim().allow('', null),
+    // simrs_type: Joi.string().trim().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.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),
+    // 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 => {

src/validators/sales/vendor_experience/VendorExperienceValidators.ts

@@ -3,47 +3,52 @@ import { validateWithSchema } from '../../ValidateSchema';
 import { VendorExperienceRequestDTO } from '../../../types/admin/vendor_experience/VendorExperienceDTO';
 
 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.object({
-        note: Joi.string().allow('', null),
-        tags: Joi.array().items(Joi.string()).optional().default([]),
-    }).optional().allow(null),
+    category_id: Joi.string().uuid().optional(),
+    content: Joi.string().trim().allow('', null),
+    // simrs_type: Joi.string().trim().required().messages({
+    //     'string.empty': 'Simrs type is required',
+    //     'string.base': 'Simrs type must be a string',
+    // }),
+    // 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.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),
+    // 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({
-    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.object({
-        note: Joi.string().allow('', null),
-        tags: Joi.array().items(Joi.string()).optional().default([]),
-    }).optional().allow(null),
+    category_id: Joi.string().uuid().optional(),
+    content: Joi.string().trim().allow('', null),
+    // 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.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),
+    // 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 => {

tsconfig.json

@@ -27,7 +27,7 @@
 
     /* Modules */
     "module": "CommonJS" /* Specify what module code is generated. */,
-    "rootDir": "./" /* Specify the root folder within your source files. */,
+    "rootDir": "./index.ts" /* Specify the root folder within your source files. */,
     "moduleResolution": "node" /* Specify how TypeScript looks up a file from a given module specifier. */,
     // "baseUrl": "./",                                  /* Specify the base directory to resolve non-relative module names. */
     // "paths": {},                                      /* Specify a set of entries that re-map imports to additional lookup locations. */
@@ -111,10 +111,12 @@
     "skipLibCheck": true /* Skip type checking all .d.ts files. */
   },
   "include": [
-    "./src",
+    "./",
+    "./storage/img",
+    "./config",
     "./prisma",
     "index.ts",
-    "./src/**/*.ts",
+    "./src/**/*.ts"
   ],
   "exclude": ["node_modules"]
-}
+}