From 9877b776c0ea73d9fafbe398e0486d9c14bd7c51 Mon Sep 17 00:00:00 2001
From: wayanrivan <rivanwayan867@gmail.com>
Date: Thu, 23 Apr 2026 14:23:55 +0700
Subject: [PATCH] update

---
 src/controllers/room.ts                | 12 ++++++------
 src/controllers/service_examination.ts | 21 ++++++++++++++-------
 2 files changed, 20 insertions(+), 13 deletions(-)

diff --git a/src/controllers/room.ts b/src/controllers/room.ts
index 1b1b3a4..0f4fd2b 100644
--- a/src/controllers/room.ts
+++ b/src/controllers/room.ts
@@ -183,8 +183,8 @@ export class RoomController {
 			room.location = param.location;
 			room.picture = param.picture;
 			room.floor = param.floor;
-			room.created_by = req.auth.data.name;
-			room.updated_by = req.auth.data.name;
+			room.created_by = req.auth?.data.name;
+			room.updated_by = req.auth?.data.name;
 			await queryRunner.manager.save(room);
 
 			await queryRunner.commitTransaction();
@@ -266,7 +266,7 @@ export class RoomController {
 			room.floor = param.floor;
 			room.location = param.location;
 			room.picture = param.picture;
-			room.updated_by = req.auth.data.name;
+			room.updated_by = req.auth?.data.name;
 			await queryRunner.manager.save(room);
 
 			await queryRunner.commitTransaction();
@@ -299,13 +299,13 @@ export class RoomController {
 			if (!param.hard) {
 				let room: Room = await RoomModel.list({ "Room.id": param.id }).then((q) => q.getOne());
 				if (!room) throw { message: "Room " + Language.lang.failed_not_found };
-				room.deleted_by = req.auth.data.name;
+				room.deleted_by = req.auth?.data.name;
 				room.deleted_at = moment().toDate();
 				await OrmHelper.DB.manager.save(room);
 				affected = 1;
 			} else {
 				const repo = OrmHelper.DB.getRepository(Room);
-				affected = (await repo.delete({ id: param.id })).affected;
+				affected = (await repo.delete({ id: param.id })).affected ?? 0;
 			}
 
 			if (affected > 0) {
@@ -332,7 +332,7 @@ export class RoomController {
 			});
 			const param: any = await schema.validateAsync(req.params);
 			const repo = OrmHelper.DB.getRepository(Room);
-			const affected = (await repo.restore({ id: param.id })).affected;
+			const affected = (await repo.restore({ id: param.id })).affected ?? 0;
 			if (affected > 0) {
 				return ReturnHelper.successResponseAny(res, 200, Language.lang.success_restore, {});
 			} else {
diff --git a/src/controllers/service_examination.ts b/src/controllers/service_examination.ts
index cd93c42..7cad55d 100644
--- a/src/controllers/service_examination.ts
+++ b/src/controllers/service_examination.ts
@@ -41,20 +41,20 @@ export class ServiceExaminationController {
 
 			let filter = param.filter && param.filter !== "" ? JSON.parse(param.filter) : {};
 
-			var query = await ServiceModel.list(filter);
+			// Clone terpisah untuk count dan list
+			const res_count = await ServiceModel.list(filter);
+			const res_list = await ServiceModel.list(filter);
 
 			const offset = (param.page - 1) * param.limit;
-			let limit = param.limit;
 
-			const res_count = query;
-			const res_list = query
+			res_list
 				.leftJoinAndSelect("Service.serviceType", "serviceType")
 				.leftJoinAndSelect("Service.examination_details", "examinationDetails")
 				.leftJoinAndSelect("examinationDetails.measurement_unit", "measurementUnit")
 				.leftJoinAndSelect("examinationDetails.reference_range", "referenceRange")
-				.orderBy("Service." + param.order_field, param.order_direction)
+				.orderBy("Service." + param.order_field, param.order_direction as "ASC" | "DESC")
 				.offset(offset)
-				.limit(limit);
+				.limit(param.limit);
 
 			if (param.with_deleted) {
 				res_count.withDeleted();
@@ -66,7 +66,14 @@ export class ServiceExaminationController {
 			const list_data = await res_list.getMany();
 			const count_data = CommonHelper.countObject(list_data);
 
-			return ReturnHelper.successResponselist(res, 200, Language.lang.success_view, count_data, current_page, total_count_data, list_data);
+			return ReturnHelper.successResponselist(
+				res, 200,
+				Language.lang.success_view,
+				count_data,
+				current_page,
+				total_count_data,
+				list_data
+			);
 		} catch (e: unknown) {
 			log.error(e);
 			const err = e as Error;