@things-factory/product-base 7.0.1-beta.14 → 7.0.1-beta.22

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/product-base",
-  "version": "7.0.1-beta.14",
+  "version": "7.0.1-beta.22",
   "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 -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/biz-base": "^7.0.1-beta.14",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/routing-base": "^7.0.1-beta.14"
+    "@things-factory/biz-base": "^7.0.1-beta.22",
+    "@things-factory/env": "^7.0.1-beta.18",
+    "@things-factory/routing-base": "^7.0.1-beta.22"
   },
-  "gitHead": "f98cf5cb94295657c43465d39cf55162f5566c59"
+  "gitHead": "60c6bc4d55359465636a549687fc3e3f03d44a18"
 }

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

@@ -3,7 +3,14 @@ import { Brackets, In, SelectQueryBuilder } from 'typeorm'
 
 import { Attachment } from '@things-factory/attachment-base'
 import { User } from '@things-factory/auth-base'
-import { Bizplace, getCompaniesBizplaces, getCompanyBizplace, getMyBizplace, getPartnersCompanyBizplaces, getPermittedBizplaceIds } from '@things-factory/biz-base'
+import {
+  Bizplace,
+  getCompaniesBizplaces,
+  getCompanyBizplace,
+  getMyBizplace,
+  getPartnersCompanyBizplaces,
+  getPermittedBizplaceIds
+} from '@things-factory/biz-base'
 import { logger } from '@things-factory/env'
 import { buildCondition, Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
@@ -53,7 +60,7 @@ export class ProductQuery {
 
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductList)
-  async products(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductList> {
+  async products(@Args(type => ListParam) params: ListParam, @Ctx() context: ResolverContext): Promise<ProductList> {
     const { domain, user } = context.state
     const { domains }: { domains: Domain[] } = user as any /* TODO clarify this */
     let bizplaces: Bizplace[]
@@ -94,7 +101,10 @@ export class ProductQuery {
 
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductList)
-  async myBizplaceProducts(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductList> {
+  async myBizplaceProducts(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductList> {
     try {
       const { domain, user }: { domain: Domain; user: User } = context.state
       const bizplaceFilter = params.filters.find(filter => filter.name === 'bizplace_id')
@@ -106,7 +116,10 @@ export class ProductQuery {
 
       const qb: SelectQueryBuilder<Product> = buildCustomConditions(params, context, bizplaces)
 
-      let [items, total] = await qb.leftJoinAndSelect('Product.productDetails', 'ProductDetails').leftJoinAndSelect('Product.routing', 'Routing').getManyAndCount()
+      let [items, total] = await qb
+        .leftJoinAndSelect('Product.productDetails', 'ProductDetails')
+        .leftJoinAndSelect('Product.routing', 'Routing')
+        .getManyAndCount()
 
       items = items.map(itm => {
         let defaultProductDetail = itm.productDetails.find(itm => itm.isDefault)
@@ -125,7 +138,10 @@ export class ProductQuery {
 
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductList)
-  async productsByBizplace(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductList> {
+  async productsByBizplace(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductList> {
     const { domain, user } = context.state
     const bizplaceFilter = params.filters.find(x => x.name == 'bizplace')
 
@@ -173,7 +189,10 @@ export class ProductQuery {
    * */
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductList)
-  async pureProductsByBizplace(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductList> {
+  async pureProductsByBizplace(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductList> {
     const { domain, user } = context.state
     const bizplaceFilter = params.filters.find(x => x.name == 'bizplace')
 

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

@@ -13,7 +13,7 @@ import { ProductBundleList } from './product-bundle-types'
 export class ProductBundleQuery {
   @Query(returns => ProductBundleList)
   async myBizplaceProductBundles(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductBundleList> {
     const { domain } = context.state
@@ -65,7 +65,10 @@ export class ProductBundleQuery {
   }
 
   @Query(returns => ProductBundleList)
-  async productBundles(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductBundleList> {
+  async productBundles(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductBundleList> {
     const convertedParams = convertListParams(params)
     const [items, total] = await getRepository(ProductBundle).findAndCount({
       ...convertedParams

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

@@ -12,7 +12,7 @@ import { ProductBundleSettingList } from './product-bundle-setting-types'
 export class ProductBundleSettingQuery {
   @Query(returns => ProductBundleSettingList)
   async productBundleSettings(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductBundleSettingList> {
     const convertedParams = convertListParams(params)
@@ -25,7 +25,7 @@ export class ProductBundleSettingQuery {
 
   @Query(returns => ProductBundleSettingList)
   async productBundleSets(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductBundleSettingList> {
     const { domain } = context.state

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

@@ -19,7 +19,7 @@ export class ProductCombinationQuery {
 
   @Query(returns => ProductCombinationList, { description: 'To fetch multiple ProductCombinations' })
   async productCombinations(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductCombinationList> {
     const convertedParams = convertListParams(params)

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

@@ -101,14 +101,14 @@ export class ProductCombination {
   updatedAt?: Date
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   creator?: User
 
   @RelationId((productCombination: ProductCombination) => productCombination.creator)
   creatorId?: string
 
   @ManyToOne(type => User, { nullable: true })
-  @Field({ nullable: true })
+  @Field(type => User, { nullable: true })
   updater?: User
 
   @RelationId((productCombination: ProductCombination) => productCombination.updater)

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

@@ -29,7 +29,7 @@ export class ProductCombinationSettingQuery {
 
   @Query(returns => ProductCombinationSettingList, { description: 'To fetch multiple ProductCombinationSettings' })
   async productCombinationSettings(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductCombinationSettingList> {
     const { domain } = context.state
@@ -42,7 +42,7 @@ export class ProductCombinationSettingQuery {
 
   @Query(returns => ProductCombinationSettingList, { description: 'To fetch a set of product combinations' })
   async productCombinationSets(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductCombinationSettingList> {
     const { domain } = context.state

package/server/service/product-detail-bizplace-setting/product-detail-bizplace-setting-query.ts

@@ -24,7 +24,7 @@ export class ProductDetailBizplaceSettingQuery {
 
   @Query(returns => ProductDetailBizplaceSettingList)
   async productDetailBizplaceSettings(
-    @Args() params: ListParam,
+    @Args(type => ListParam) params: ListParam,
     @Ctx() context: ResolverContext
   ): Promise<ProductDetailBizplaceSettingList> {
     const { domain, user: updater }: { domain: Domain; user: User } = context.state

package/server/service/product-set/product-set-mutation.ts

@@ -130,7 +130,11 @@ export async function createProductSet(productSet: NewProductSet, context: Resol
   })
 }
 
-export async function updateProductSet(id: string, patch: ProductSetPatch, context: ResolverContext) {
+export async function updateProductSet(
+  id: string,
+  patch: ProductSetPatch,
+  context: ResolverContext
+): Promise<ProductSet> {
   const { user, tx } = context.state
 
   const bizplaceRepo: Repository<Bizplace> = tx.getRepository(Bizplace)

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

@@ -12,7 +12,10 @@ import { ProductSetList } from './product-set-types'
 export class ProductSetQuery {
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductSetList)
-  async myBizplaceProductSets(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductSetList> {
+  async myBizplaceProductSets(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductSetList> {
     const { domain, user } = context.state
     const qb: SelectQueryBuilder<ProductSet> = getRepository(ProductSet).createQueryBuilder()
 
@@ -59,7 +62,10 @@ export class ProductSetQuery {
 
   @Directive('@privilege(category: "order", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => ProductSetList)
-  async productSets(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<ProductSetList> {
+  async productSets(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<ProductSetList> {
     const { domain, user } = context.state
 
     if (!params.filters.find((filter: any) => filter.name === 'bizplace_id')) {