@things-factory/marketplace-base 4.0.11 → 4.0.16

package/server/entities/marketplace-refund-order.ts

@@ -0,0 +1,62 @@
+import {
+  Column,
+  CreateDateColumn,
+  Entity,
+  Index,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn
+} from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { MarketplaceRefundOrderItem, MarketplaceOrder } from '../entities'
+import { Domain } from '@things-factory/shell'
+
+@Entity()
+@Index(
+  'ix_marketplace-refund-order_0',
+  (marketplaceRefundOrder: MarketplaceRefundOrder) => [marketplaceRefundOrder.domain, marketplaceRefundOrder.name],
+  { unique: true }
+)
+export class MarketplaceRefundOrder {
+    @PrimaryGeneratedColumn('uuid')
+    id: string
+  
+    @ManyToOne(type => Domain)
+    domain: Domain
+
+    @Column()
+    name: string  
+  
+    @OneToMany(type => MarketplaceRefundOrderItem, marketplaceRefundOrderItem => marketplaceRefundOrderItem.marketplaceRefundOrder)
+    marketplaceRefundOrderItems: MarketplaceRefundOrderItem[]
+
+    @Column()
+    originalOrderNo: string
+
+    @Column()
+    orderNo: string
+
+    @Column({ nullable: true, type: 'float' })
+    amount: number
+
+    @Column({ nullable: true })
+    status: string
+
+    @CreateDateColumn()
+    createdAt: Date
+  
+    @UpdateDateColumn()
+    updatedAt: Date
+  
+    @ManyToOne(type => User, {
+      nullable: true
+    })
+    creator: User
+  
+    @ManyToOne(type => User, {
+      nullable: true
+    })
+    updater: User    
+}

package/server/graphql/resolvers/index.ts

@@ -7,5 +7,7 @@ export * from './marketplace-product-category'
 export * from './marketplace-product-variation'
 export * from './store-replenishment'
 export * from './store-replenishment-item'
+export * from './marketplace-refund-order'
+export * from './marketplace-report'
 
 export * from './marketplace-product-variation-price'

package/server/graphql/resolvers/marketplace-order/marketplace-orders.ts

@@ -6,10 +6,20 @@ import { MarketplaceOrder } from '../../../entities'
 
 export const marketplaceOrdersResolver = {
   async marketplaceOrders(_: any, params: ListParam, context: any) {
-    let postCodeSorter = params.sortings.filter(sort => sort.name === 'postCode')
+    let postCodeSorter = params.sortings.find(sort => sort.name === 'postCode')
+    const noOfItemsFilter = params.filters.find(param => param.name === 'itemCount')
+    const skuFilter = params.filters.find(param => param.name === 'sku')
 
     params.sortings = params.sortings.filter(sort => sort.name !== 'postCode')
 
+    if (noOfItemsFilter && noOfItemsFilter.value == 1) {
+      params.filters.find(param => param.name === 'itemCount').operator = 'eq'
+    }
+
+    if (skuFilter) {
+      params.filters = params.filters.filter(param => param.name !== 'sku')
+    }
+
     let qb: SelectQueryBuilder<MarketplaceOrder> = getRepository(MarketplaceOrder).createQueryBuilder('mo')
     buildQuery(qb, params, context)
     qb.leftJoinAndSelect('mo.domain', 'domain')
@@ -22,25 +32,23 @@ export const marketplaceOrdersResolver = {
       .leftJoinAndSelect('mo.updater', 'updater')
 
     if (postCodeSorter) {
-      qb.addOrderBy('mos.postCode', postCodeSorter[0]?.desc ? 'DESC' : 'ASC')
+      qb.addOrderBy('mos.postCode', postCodeSorter?.desc ? 'DESC' : 'ASC')
     }
 
-    let [items, total] = await qb.getManyAndCount()
+    if (skuFilter) {
+      qb.andWhere(
+        `
+        exists (select * from marketplace_order_items moi
+        inner join marketplace_product_variations mpv
+        on moi.marketplace_product_variation_id = mpv.id
+        where moi.marketplace_order_id = mo.id
+        and lower(mpv.sku) like :sku)
+      `,
+        { sku: skuFilter.value.toLowerCase() }
+      )
+    }
 
-    // const convertedParams = convertListParams(params, context.state.domain.id)
-    // const [items, total] = await getRepository(MarketplaceOrder).findAndCount({
-    //   ...convertedParams,
-    //   relations: [
-    //     'domain',
-    //     'marketplaceStore',
-    //     'marketplaceOrderItems',
-    //     'marketplaceOrderItems.marketplaceProductVariation',
-    //     'marketplaceOrderItems.marketplaceProductVariation.marketplaceProduct',
-    //     'marketplaceOrderItems.marketplaceOrderShipping',
-    //     'creator',
-    //     'updater'
-    //   ]
-    // })
+    let [items, total] = await qb.getManyAndCount()
 
     return { items, total }
   }