From 120e2942b87f28ce0482d81f30bf64bb1f1a7325 Mon Sep 17 00:00:00 2001
From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com>
Date: Tue, 9 Apr 2024 08:51:22 +0700
Subject: [PATCH] fix: data ordering

---
 src/controllers/branch-contact-controller.ts  | 1 +
 src/controllers/branch-controller.ts          | 1 +
 src/controllers/branch-user-controller.ts     | 2 ++
 src/controllers/customer-branch-controller.ts | 2 ++
 src/controllers/customer-controller.ts        | 1 +
 src/controllers/user-controller.ts            | 1 +
 6 files changed, 8 insertions(+)

diff --git a/src/controllers/branch-contact-controller.ts b/src/controllers/branch-contact-controller.ts
index 90ccbe7..1f8a473 100644
--- a/src/controllers/branch-contact-controller.ts
+++ b/src/controllers/branch-contact-controller.ts
@@ -51,6 +51,7 @@ export class BranchContactController extends Controller {
   ) {
     const [result, total] = await prisma.$transaction([
       prisma.branchContact.findMany({
+        orderBy: { createdAt: "asc" },
         where: { branchId },
         take: pageSize,
         skip: (page - 1) * pageSize,
diff --git a/src/controllers/branch-controller.ts b/src/controllers/branch-controller.ts
index 31a0dd2..adb3fef 100644
--- a/src/controllers/branch-controller.ts
+++ b/src/controllers/branch-controller.ts
@@ -107,6 +107,7 @@ export class BranchController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.branch.findMany({
+        orderBy: { createdAt: "asc" },
         include: {
           province: true,
           district: true,
diff --git a/src/controllers/branch-user-controller.ts b/src/controllers/branch-user-controller.ts
index 5987661..503d215 100644
--- a/src/controllers/branch-user-controller.ts
+++ b/src/controllers/branch-user-controller.ts
@@ -45,6 +45,7 @@ export class BranchUserController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.branchUser.findMany({
+        orderBy: { user: { createdAt: "asc" } },
         include: {
           user: {
             include: {
@@ -138,6 +139,7 @@ export class UserBranchController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.branchUser.findMany({
+        orderBy: { branch: { createdAt: "asc" } },
         include: {
           branch: {
             include: {
diff --git a/src/controllers/customer-branch-controller.ts b/src/controllers/customer-branch-controller.ts
index 303d9f8..329d512 100644
--- a/src/controllers/customer-branch-controller.ts
+++ b/src/controllers/customer-branch-controller.ts
@@ -106,6 +106,7 @@ export class CustomerBranchController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.customerBranch.findMany({
+        orderBy: { createdAt: "asc" },
         include: {
           province: true,
           district: true,
@@ -160,6 +161,7 @@ export class CustomerBranchController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.employee.findMany({
+        orderBy: { createdAt: "asc" },
         include: {
           province: true,
           district: true,
diff --git a/src/controllers/customer-controller.ts b/src/controllers/customer-controller.ts
index fe7d347..b6686f2 100644
--- a/src/controllers/customer-controller.ts
+++ b/src/controllers/customer-controller.ts
@@ -61,6 +61,7 @@ export class CustomerController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.customer.findMany({
+        orderBy: { createdAt: "asc" },
         where,
         take: pageSize,
         skip: (page - 1) * pageSize,
diff --git a/src/controllers/user-controller.ts b/src/controllers/user-controller.ts
index 97c9b42..672f7cb 100644
--- a/src/controllers/user-controller.ts
+++ b/src/controllers/user-controller.ts
@@ -127,6 +127,7 @@ export class UserController extends Controller {
 
     const [result, total] = await prisma.$transaction([
       prisma.user.findMany({
+        orderBy: { createdAt: "asc" },
         include: {
           province: true,
           district: true,