@things-factory/biz-base 5.0.7 → 5.0.11

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

@@ -9,10 +9,11 @@ import {
   getPartnerBizplaceIds,
   getPartnersBizplaces,
   getPartnersCompanyBizplaces,
-  getPermittedBizplaceIds
+  getPermittedBizplaceIds,
+  getUserBizplaces
 } from '../../utils'
 import { Bizplace } from './bizplace'
-import { BizplaceList, UserBizplace } from './bizplace-types'
+import { BizplaceList } from './bizplace-types'
 
 @Resolver(Bizplace)
 export class BizplaceQuery {
@@ -40,32 +41,32 @@ export class BizplaceQuery {
     })
   }
 
+  /* TODO make it work */
   @Directive('@privilege(category: "bizplace", privilege: "query", domainOwnerGranted: true)')
-  @Query(returns => [UserBizplace])
-  async userBizplaces(@Arg('email') email: string, @Ctx() context: any): Promise<UserBizplace[]> {
-    const user: User = await getRepository(User).findOne(
-      {
-        domain: context.state.domain,
-        email: email != '' ? email : context.state.user.email
-      },
-      {
-        relations: ['bizplaces']
-      }
-    )
-    const bizplaces = await getRepository(Bizplace).find({ domain: context.state.domain })
-    const userBizplaces = user.bizplaces
-    return bizplaces.map((bizplace: Bizplace) => {
-      return {
-        id: bizplace.id,
-        name: bizplace.name,
-        description: bizplace.description,
-        userBizplaceId: userBizplaces
-          .map(userBiz => userBiz.bizplace.id)
-          .slice(0, 1)
-          .shift(),
-        assigned: userBizplaces.filter((userBizplace: Bizplace) => userBizplace.id === bizplace.id).length > 0
-      }
+  @Query(returns => [Bizplace])
+  async userBizplaces(@Arg('email') email: string, @Ctx() context: any): Promise<Bizplace[]> {
+    const { domain } = context.state
+
+    const user: User = await getRepository(User).findOne({
+      email: email != '' ? email : context.state.user.email
     })
+
+    return await getUserBizplaces(user)
+
+    // const bizplaces = await getRepository(Bizplace).find({ domain })
+    // // const userBizplaces = user.bizplaces
+    // return bizplaces.map((bizplace: Bizplace) => {
+    //   return {
+    //     id: bizplace.id,
+    //     name: bizplace.name,
+    //     description: bizplace.description,
+    //     userBizplaceId: userBizplaces
+    //       .map(userBiz => userBiz.bizplace.id)
+    //       .slice(0, 1)
+    //       .shift(),
+    //     assigned: userBizplaces.filter((userBizplace: Bizplace) => userBizplace.id === bizplace.id).length > 0
+    //   }
+    // })
   }
 
   @Directive('@privilege(category: "bizplace", privilege: "query", domainOwnerGranted: true)')
@@ -214,7 +215,7 @@ export async function bizplaceUsers(
   const [items, total] = await userRepo.findAndCount({
     ...params,
     where: {
-      ...params.where,
+      ...(params.where as any),
       id: In(userIds)
     }
   })

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

@@ -9,15 +9,12 @@ import { BizplaceList } from '../bizplace/bizplace-types'
 import { Company } from './company'
 import { CompanyList } from './company-types'
 
-const debug = require('debug')('things-factory:biz-base:company-resolver')
-
 @Resolver(Company)
 export class CompanyQuery {
   @Directive('@privilege(category: "company", privilege: "query", domainOwnerGranted: true)')
   @Query(returns => Company)
   async company(@Ctx() context: any): Promise<Company> {
     const { domain } = context.state
-    debug('company', domain?.subdomain)
 
     const foundCompany: Company | null = await getRepository(Company).findOne({
       domain
@@ -44,7 +41,6 @@ export class CompanyQuery {
   @Query(returns => BizplaceList)
   async companyBizplaces(@Ctx() context: any): Promise<BizplaceList> {
     const { domain, user } = context.state
-    debug('companyBizplaces', domain?.subdomain)
 
     const userDomains: Domain[] = await getUserDomains(user)
     const company: Company = await getRepository(Company).findOne({
@@ -63,7 +59,6 @@ export class CompanyQuery {
   @Query(returns => UserList)
   async companyUsers(@Ctx() context: any): Promise<UserList> {
     const { domain } = context.state
-    debug('companyUsers', domain?.subdomain)
 
     const items: User[] = await getDomainUsers(domain)
 

package/server/service/contact-point/contact-point-mutation.ts

@@ -16,7 +16,7 @@ export class ContactPointMutation {
     @Arg('contactPoint') contactPoint: NewContactPoint,
     @Ctx() context: any
   ): Promise<ContactPoint> {
-    return await createContactPoint(contactPoint, context)
+    return await createContactPoint(contactPoint as any, context)
   }
 
   @Directive('@privilege(category: "contact_point", privilege: "mutation")')

package/server/utils/get-permitted-bizplaces.ts

@@ -78,7 +78,7 @@ export async function getOutletBizplace(outletId: string, tx?: EntityManager) {
 export async function getCompanyBizplace(
   domain: Domain,
   user: User,
-  customerBizplaceId: string,
+  customerBizplaceId?: string,
   tx?: EntityManager
 ): Promise<Bizplace> {
   const bizplaceRepo = tx ? tx.getRepository(Bizplace) : getRepository(Bizplace)
@@ -145,7 +145,7 @@ export async function getPartnerBizplaceIds(domain: Domain, user: User, tx?: Ent
     })
 
     for (let partner of partners) {
-      partnerBizplaces.push(partner.partnerBizplace)
+      partnerBizplaces.push((partner as any).partnerBizplace)
     }
   }
   return partnerBizplaces.map((bizplace: Bizplace) => bizplace.id || null)
@@ -286,7 +286,7 @@ export async function getCustomerBizplaces(domain: Domain, tx?: EntityManager):
   })
 }
 
-export async function getSubdomainBizplace(subdomain: Domain, tx?: EntityManager): Promise<Bizplace> {
+export async function getSubdomainBizplace(subdomain: string, tx?: EntityManager): Promise<Bizplace> {
   const domainRepo = tx ? tx.getRepository(Domain) : getRepository(Domain)
 
   const domain: Domain = await domainRepo.findOne({