From 59cb928dd7a16e1869cefc4e01ea46ffe83fb03f Mon Sep 17 00:00:00 2001
From: admin <admin@git.np-dms.work>
Date: Thu, 26 Mar 2026 15:47:45 +0700
Subject: [PATCH] 260326:1547 Fixing Refactor ADR-019 Naming convention uuid
 #04

---
 backend/src/modules/drawing/asbuilt-drawing.service.ts   | 2 +-
 backend/src/modules/drawing/contract-drawing.service.ts  | 2 +-
 backend/src/modules/drawing/shop-drawing.service.ts      | 2 +-
 backend/src/modules/notification/notification.service.ts | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/backend/src/modules/drawing/asbuilt-drawing.service.ts b/backend/src/modules/drawing/asbuilt-drawing.service.ts
index 1f28357..3f90964 100644
--- a/backend/src/modules/drawing/asbuilt-drawing.service.ts
+++ b/backend/src/modules/drawing/asbuilt-drawing.service.ts
@@ -304,7 +304,7 @@ export class AsBuiltDrawingService {
 
   async findOneByUuid(uuid: string) {
     const asBuiltDrawing = await this.asBuiltDrawingRepo.findOne({
-      where: { uuid },
+      where: { publicId: uuid },
       relations: [
         'mainCategory',
         'subCategory',
diff --git a/backend/src/modules/drawing/contract-drawing.service.ts b/backend/src/modules/drawing/contract-drawing.service.ts
index 418fc30..a1d8610 100644
--- a/backend/src/modules/drawing/contract-drawing.service.ts
+++ b/backend/src/modules/drawing/contract-drawing.service.ts
@@ -205,7 +205,7 @@ export class ContractDrawingService {
 
   async findOneByUuid(uuid: string) {
     const drawing = await this.drawingRepo.findOne({
-      where: { uuid },
+      where: { publicId: uuid },
       relations: ['attachments'],
     });
 
diff --git a/backend/src/modules/drawing/shop-drawing.service.ts b/backend/src/modules/drawing/shop-drawing.service.ts
index 538df3a..a2d4c88 100644
--- a/backend/src/modules/drawing/shop-drawing.service.ts
+++ b/backend/src/modules/drawing/shop-drawing.service.ts
@@ -298,7 +298,7 @@ export class ShopDrawingService {
 
   async findOneByUuid(uuid: string) {
     const shopDrawing = await this.shopDrawingRepo.findOne({
-      where: { uuid },
+      where: { publicId: uuid },
       relations: [
         'mainCategory',
         'subCategory',
diff --git a/backend/src/modules/notification/notification.service.ts b/backend/src/modules/notification/notification.service.ts
index ca4e2ec..6775953 100644
--- a/backend/src/modules/notification/notification.service.ts
+++ b/backend/src/modules/notification/notification.service.ts
@@ -155,7 +155,7 @@ export class NotificationService {
 
   async markAsReadByUuid(uuid: string, userId: number): Promise<void> {
     const notification = await this.notificationRepo.findOne({
-      where: { uuid, userId },
+      where: { publicId: uuid, userId },
     });
 
     if (!notification) {