From 48016bfa88bf18fc54f776c1a88505540042d869 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Tue, 21 Apr 2026 13:37:57 +0700
Subject: [PATCH] update

---
 src/controllers/pharmacy/pharmacy_info.ts | 56 ++++++++++-------------
 src/swagger/builder.js                    |  8 ++--
 2 files changed, 27 insertions(+), 37 deletions(-)

diff --git a/src/controllers/pharmacy/pharmacy_info.ts b/src/controllers/pharmacy/pharmacy_info.ts
index 357fc3c..0833c35 100644
--- a/src/controllers/pharmacy/pharmacy_info.ts
+++ b/src/controllers/pharmacy/pharmacy_info.ts
@@ -5,7 +5,7 @@ import { OrmHelper } from "../../helpers/orm";
 import Joi from "joi";
 import { ILogObj, Logger } from "tslog";
 import { Language } from "../../langs/lang";
-import { PharmacyInfo, Paging } from "entity";
+import { PharmacyInfo, Paging, Subdistrict } from "entity";
 import CommonHelper from "../../helpers/common";
 import * as fastcsv from 'fast-csv';
 import dayjs from "dayjs";
@@ -261,11 +261,11 @@ export class PharmacyInfoController {
 
             const data = new PharmacyInfo()
             data.name = param.name,
-            data.address = param.address
-            data.munisipiu = param.munisipiu,
-            data.postu_admin = param.postu_admin
-            data.suco = param.suco
-            data.aldeia = param.aldeia
+                data.address = param.address
+            // data.munisipiu = param.munisipiu,
+            //     data.postu_admin = param.postu_admin
+            // data.suco = param.suco
+            // data.aldeia = param.aldeia
             data.phone = param.phone
             data.default_room = param.default_room_id
             data.logo = param.logo
@@ -329,35 +329,25 @@ export class PharmacyInfoController {
                     .required()
                     .label('Address'),
 
-                munisipiu: Joi.string()
+                province: Joi.string()
                     .uuid()
-                    .required()
-                    .label('Munisipiu'),
+                    .allow("", null)
+                    .label('Province'),
 
-                postu_admin: Joi.string()
+                city: Joi.string()
                     .uuid()
-                    .required()
-                    .label('Postu Admin'),
+                    .allow("", null)
+                    .label('City'),
 
-                suco: Joi.string()
+                subdistrict: Joi.string()
                     .uuid()
-                    .required()
-                    .label('Suco'),
+                    .allow("", null)
+                    .label('Subdistrict'),
 
-                aldeia: Joi.string()
+                ward: Joi.string()
                     .uuid()
-                    .required()
-                    .label('Aldeia'),
-
-                phone: Joi.string()
-                    .max(30)
-                    .optional()
-                    .label('Phone'),
-
-                default_room_id: Joi.string()
-                    .uuid()
-                    .required()
-                    .label('Default Room'),
+                    .allow("", null)
+                    .label('Ward'),
             });
 
             req.body.id = req.params['id'];
@@ -370,11 +360,11 @@ export class PharmacyInfoController {
 
             if (data != null) {
                 data.name = param.name,
-                data.address = param.address
-                data.munisipiu = param.munisipiu,
-                data.postu_admin = param.postu_admin
-                data.suco = param.suco
-                data.aldeia = param.aldeia
+                    data.address = param.address
+                // data.munisipiu = param.munisipiu,
+                //     data.postu_admin = param.postu_admin
+                // data.suco = param.suco
+                // data.aldeia = param.aldeia
                 data.phone = param.phone
                 data.default_room = param.default_room_id
                 data.logo = param.logo
diff --git a/src/swagger/builder.js b/src/swagger/builder.js
index 802422d..84e5200 100644
--- a/src/swagger/builder.js
+++ b/src/swagger/builder.js
@@ -329,10 +329,10 @@ const doc = {
         $logo: "Logo (string, max 256)",
         $name: "Name (string, max 256)",
         $address: "Address (string, max 500)",
-        $munisipiu: "Munisipiu ID (UUID)",
-        $postu_admin: "Postu Admin ID (UUID)",
-        $suco: "Suco ID (UUID)",
-        $aldeia: "Aldeia ID (UUID)",
+        // $munisipiu: "Munisipiu ID (UUID)",
+        // $postu_admin: "Postu Admin ID (UUID)",
+        // $suco: "Suco ID (UUID)",
+        // $aldeia: "Aldeia ID (UUID)",
         $phone: "Phone (string, max 30, optional)",
         $default_room_id: "Default Room ID (UUID)",
         $province: "Province Code",