@things-factory/product-base 7.1.23 → 7.1.25

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-base",
-  "version": "7.1.23",
+  "version": "7.1.25",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create ./server/migrations/migration"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^7.1.23",
+    "@things-factory/biz-base": "^7.1.24",
     "@things-factory/env": "^7.1.16",
-    "@things-factory/routing-base": "^7.1.23"
+    "@things-factory/routing-base": "^7.1.24"
   },
-  "gitHead": "4dbcca46214112c5157cb5e167779f3154d4bc88"
+  "gitHead": "99180f1ee824d20cd9521b432c3a2bdd1f600354"
 }

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

@@ -278,14 +278,14 @@ export class ProductQuery {
   }
 
   @FieldResolver(type => String, { nullable: true })
-  async warehouseId(@Root() product: Product): Promise<String | undefined> {
-    if (!product.warehouseName) return null
+  async warehouseName(@Root() product: Product): Promise<String | undefined> {
+    if (!product.warehouseId) return null
 
     const items = await getRepository(Product).query(`
-      SELECT w.id as "warehouseId" FROM products p LEFT JOIN warehouses w ON p.warehouse_name = w.name and w.domain_id = p.domain_id WHERE p.id = '${product.id}'
+      SELECT w.name as "warehouseName" FROM products p LEFT JOIN warehouses w ON p.warehouse_id::uuid = w.id and w.domain_id = p.domain_id WHERE p.id = '${product.id}'
     `)
 
-    return items[0].warehouseId || null
+    return items[0].warehouseName || null
   }
 }
 

package/server/service/product/product-types.ts

@@ -185,7 +185,7 @@ export class NewProduct {
   routing?: ObjectRef
 
   @Field({ nullable: true })
-  warehouseName?: string
+  warehouseId?: string
 
   @Field(type => GraphQLUpload, { nullable: true })
   thumbnail?: FileUpload
@@ -413,7 +413,7 @@ export class ProductPatch {
   routing?: ObjectRef
 
   @Field({ nullable: true })
-  warehouseName?: string
+  warehouseId?: string
 
   @Field(type => GraphQLUpload, { nullable: true })
   thumbnail?: FileUpload

package/server/service/product/product.ts

@@ -456,7 +456,7 @@ export class Product {
 
   @Column({ nullable: true })
   @Field(type => String, { nullable: true })
-  warehouseName?: string
+  warehouseId?: string
 
   @Field(type => String, { nullable: true })
   thumbnail?: string