@things-factory/warehouse-base 7.1.23 → 7.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/warehouse-base",
-  "version": "7.1.23",
+  "version": "7.1.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,12 +24,12 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^7.1.23",
-    "@things-factory/id-rule-base": "^7.1.23",
-    "@things-factory/integration-sellercraft": "^7.1.23",
-    "@things-factory/marketplace-base": "^7.1.23",
-    "@things-factory/product-base": "^7.1.23",
-    "@things-factory/setting-base": "^7.1.23"
+    "@things-factory/biz-base": "^7.1.24",
+    "@things-factory/id-rule-base": "^7.1.24",
+    "@things-factory/integration-sellercraft": "^7.1.24",
+    "@things-factory/marketplace-base": "^7.1.25",
+    "@things-factory/product-base": "^7.1.25",
+    "@things-factory/setting-base": "^7.1.24"
   },
-  "gitHead": "4dbcca46214112c5157cb5e167779f3154d4bc88"
+  "gitHead": "99180f1ee824d20cd9521b432c3a2bdd1f600354"
 }

package/server/service/warehouse/warehouse-mutation.ts

@@ -1,8 +1,9 @@
 import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
-import { Repository } from 'typeorm'
+import { Repository, In, Equal } from 'typeorm'
 
 import { Warehouse } from './warehouse'
 import { NewWarehouse, WarehousePatch } from './warehouse-types'
+import { Product } from '@things-factory/product-base'
 
 @Resolver(Warehouse)
 export class WarehouseMutation {
@@ -61,6 +62,21 @@ export class WarehouseMutation {
   @Directive('@transaction')
   @Mutation(returns => Boolean)
   async deleteWarehouse(@Arg('id') id: string, @Ctx() context: ResolverContext): Promise<Boolean> {
+    const { domain, user, tx } = context.state
+    const product = await tx.getRepository(Product).findOne({
+      where: {
+        domain: { id: domain.id },
+        warehouseId: Equal(id)
+      }
+    })
+
+    if (product?.id) {
+      await tx.getRepository(Product).save({
+        ...product,
+        warehouseId: null
+      })
+    }
+
     return await deleteWarehouse(id, context)
   }
 
@@ -71,6 +87,25 @@ export class WarehouseMutation {
     @Arg('ids', type => [String]) ids: string[],
     @Ctx() context: ResolverContext
   ): Promise<Boolean> {
+    const { domain, user, tx } = context.state
+    const products = await tx.getRepository(Product).find({
+      where: {
+        domain: { id: domain.id },
+        warehouseId: In(ids)
+      }
+    })
+
+    if (products?.length) {
+      await tx.getRepository(Product).save(
+        products.map(i => {
+          return {
+            ...i,
+            warehouseId: null
+          }
+        })
+      )
+    }
+
     return await deleteWarehouses(ids, context)
   }
 }

package/server/service/warehouse/warehouse-query.ts

@@ -1,7 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
 
 import { User } from '@things-factory/auth-base'
-import { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { Warehouse } from './warehouse'
 import { WarehouseList } from './warehouse-types'
@@ -29,14 +29,15 @@ export class WarehouseQuery {
   ): Promise<WarehouseList> {
     const { domain } = context.state
 
-    const convertedParams = convertListParams(params, {
-      domain: domain.id,
+    const queryBuilder = getQueryBuilderFromListParams({
+      domain,
+      params,
+      repository: getRepository(Warehouse),
       searchables: ['name', 'description']
     })
-    const [items, total] = await getRepository(Warehouse).findAndCount({
-      ...convertedParams,
-      relations: ['domain', 'creator', 'updater']
-    })
+
+    const [items, total] = await queryBuilder.getManyAndCount()
+
     return { items, total }
   }