fix symbol of include

bahram1249 · May 12, 2024 · 9339e9c · 9339e9c
1 parent a941716
commit 9339e9c
Show file tree

Hide file tree

Showing 7 changed files with 59 additions and 59 deletions.
diff --git a/apps/e-commerce/src/admin/courierOrder/courier-order.service.ts b/apps/e-commerce/src/admin/courierOrder/courier-order.service.ts
@@ -45,10 +45,10 @@ export class CourierOrderService {
 
     builder = builder
       .subQuery(true)
-      .addOrderShipmentWay()
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser()
+      .includeOrderShipmentWay()
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser()
       .offset(filter.offset)
       .limit(filter.limit)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -67,13 +67,13 @@ export class CourierOrderService {
 
     builder = builder
       .nonDeletedOrder()
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .orderShipmentWay(OrderShipmentwayEnum.delivery)
       .addOrderId(id)
       .addOrderStatus(OrderStatusEnum.OrderHasBeenProcessed)
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser();
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser();
 
     let result = await this.repository.findOne(builder.build());
     if (!result) {

diff --git a/apps/e-commerce/src/admin/deliveryOrder/delivery-order.service.ts b/apps/e-commerce/src/admin/deliveryOrder/delivery-order.service.ts
@@ -41,10 +41,10 @@ export class DeliveryOrderService {
 
     builder = builder
       .subQuery(true)
-      .addOrderShipmentWay()
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser()
+      .includeOrderShipmentWay()
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser()
       .offset(filter.offset)
       .limit(filter.limit)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -65,13 +65,13 @@ export class DeliveryOrderService {
 
     builder = builder
       .nonDeletedOrder()
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .orderShipmentWay(OrderShipmentwayEnum.delivery)
       .addOrderId(id)
       .addOrderStatus(OrderStatusEnum.SendByCourier)
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser();
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser();
 
     if (!isSuperAdmin) {
       builder = builder.addOnlyCourier(user.id);
@@ -98,13 +98,13 @@ export class DeliveryOrderService {
     let builder = this.orderQueryBuilder;
     builder = builder
       .nonDeletedOrder()
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .orderShipmentWay(OrderShipmentwayEnum.delivery)
       .addOrderId(orderId)
       .addOrderStatus(OrderStatusEnum.SendByCourier)
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser();
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser();
 
     if (!isSuperAdmin) {
       builder = builder.addOnlyCourier(user.id);

diff --git a/apps/e-commerce/src/admin/pendingOrder/pending-order.service.ts b/apps/e-commerce/src/admin/pendingOrder/pending-order.service.ts
@@ -51,10 +51,10 @@ export class PendingOrderService {
 
     builder = builder
       .subQuery(true)
-      .addAdminOrderDetails([filter.vendorId])
-      .addOrderShipmentWay()
-      .addAddress()
-      .addUser()
+      .includeAdminOrderDetails([filter.vendorId])
+      .includeOrderShipmentWay()
+      .includeAddress()
+      .includeUser()
       .limit(filter.limit)
       .offset(filter.offset)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -82,12 +82,12 @@ export class PendingOrderService {
     builder = builder
       .nonDeletedOrder()
       .addOrderId(id)
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .addOrderStatus(OrderStatusEnum.Paid)
       .addOnlyVendor([filter.vendorId])
-      .addAdminOrderDetails([filter.vendorId])
-      .addAddress()
-      .addUser();
+      .includeAdminOrderDetails([filter.vendorId])
+      .includeAddress()
+      .includeUser();
 
     let result = await this.repository.findOne(builder.build());
     if (!result) {

diff --git a/apps/e-commerce/src/admin/postageOrder/postage-order.service.ts b/apps/e-commerce/src/admin/postageOrder/postage-order.service.ts
@@ -38,10 +38,10 @@ export class PostageOrderService {
 
     builder = builder
       .subQuery(true)
-      .addOrderShipmentWay()
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser()
+      .includeOrderShipmentWay()
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser()
       .offset(filter.offset)
       .limit(filter.limit)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -60,13 +60,13 @@ export class PostageOrderService {
 
     builder = builder
       .nonDeletedOrder()
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .orderShipmentWay(OrderShipmentwayEnum.post)
       .addOrderId(id)
       .addOrderStatus(OrderStatusEnum.OrderHasBeenProcessed)
-      .addAdminOrderDetails()
-      .addAddress()
-      .addUser();
+      .includeAdminOrderDetails()
+      .includeAddress()
+      .includeUser();
 
     let result = await this.repository.findOne(builder.build());
     if (!result) {

diff --git a/apps/e-commerce/src/admin/totalOrders/total-order.service.ts b/apps/e-commerce/src/admin/totalOrders/total-order.service.ts
@@ -59,16 +59,16 @@ export class TotalOrderService {
     const count = await this.repository.count(builder.build());
 
     if (isSuperAdmin) {
-      builder = builder.addAdminOrderDetails();
+      builder = builder.includeAdminOrderDetails();
     } else {
-      builder = builder.addAdminOrderDetails(vendorIds);
+      builder = builder.includeAdminOrderDetails(vendorIds);
     }
 
     builder = builder
       .subQuery(true)
-      .addOrderShipmentWay()
-      .addAddress()
-      .addUser()
+      .includeOrderShipmentWay()
+      .includeAddress()
+      .includeUser()
       .offset(filter.offset)
       .limit(filter.limit)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -91,18 +91,18 @@ export class TotalOrderService {
     if (!isSuperAdmin) {
       builder = builder
         .addOnlyVendor(vendorIds)
-        .addAdminOrderDetails(vendorIds);
+        .includeAdminOrderDetails(vendorIds);
     } else {
-      builder = builder.addAdminOrderDetails();
+      builder = builder.includeAdminOrderDetails();
     }
 
     builder = builder
       .nonDeletedOrder()
-      .addOrderShipmentWay()
+      .includeOrderShipmentWay()
       .addOrderId(id)
       .addNegativeOrderStatus(OrderStatusEnum.WaitingForPayment)
-      .addAddress()
-      .addUser();
+      .includeAddress()
+      .includeUser();
 
     let result = await this.repository.findOne(builder.build());
     if (!result) {

diff --git a/apps/e-commerce/src/admin/utilOrder/service/order-query-builder.service.ts b/apps/e-commerce/src/admin/utilOrder/service/order-query-builder.service.ts
@@ -125,7 +125,7 @@ export class OrderQueryBuilder {
     return this;
   }
 
-  addAdminOrderDetails(vendors?: number[]) {
+  includeAdminOrderDetails(vendors?: number[]) {
     let includeBuilder = new IncludeOptionsBuilder({
       model: ECOrderDetail,
       as: 'details',
@@ -240,7 +240,7 @@ export class OrderQueryBuilder {
     return this;
   }
 
-  addUserOrderDetails() {
+  includeUserOrderDetails() {
     let includeBuilder = new IncludeOptionsBuilder({
       model: ECOrderDetail,
       as: 'details',
@@ -330,7 +330,7 @@ export class OrderQueryBuilder {
     return this;
   }
 
-  addAddress() {
+  includeAddress() {
     this.builder = this.builder.thenInlcude({
       attributes: [
         'id',
@@ -369,7 +369,7 @@ export class OrderQueryBuilder {
     return this;
   }
 
-  addUser() {
+  includeUser() {
     this.builder = this.builder.thenInlcude({
       attributes: ['id', 'firstname', 'lastname', 'username', 'phoneNumber'],
       model: User,
@@ -378,7 +378,7 @@ export class OrderQueryBuilder {
     return this;
   }
 
-  addOrderShipmentWay() {
+  includeOrderShipmentWay() {
     this.builder = this.builder.thenInlcude({
       attributes: ['id', 'name'],
       model: ECOrderShipmentWay,

diff --git a/apps/e-commerce/src/user/order/user-order.service.ts b/apps/e-commerce/src/user/order/user-order.service.ts
@@ -29,10 +29,10 @@ export class UserOrderService {
       .subQuery(true)
       .includeOrderStatus()
       .includePaymentGateway()
-      .addUserOrderDetails()
-      .addOrderShipmentWay()
-      .addAddress()
-      .addUser()
+      .includeUserOrderDetails()
+      .includeOrderShipmentWay()
+      .includeAddress()
+      .includeUser()
       .offset(filter.offset)
       .limit(filter.limit)
       .order({ orderBy: filter.orderBy, sortOrder: filter.sortOrder });
@@ -50,10 +50,10 @@ export class UserOrderService {
       .addOnlyUser(user.id)
       .addOrderId(id)
       .addNegativeOrderStatus(OrderStatusEnum.WaitingForPayment)
-      .addUserOrderDetails()
-      .addOrderShipmentWay()
-      .addAddress()
-      .addUser()
+      .includeUserOrderDetails()
+      .includeOrderShipmentWay()
+      .includeAddress()
+      .includeUser()
       .includePaymentGateway()
       .includeOrderStatus();