@things-factory/biz-base 6.0.0-alpha.0 → 6.0.0-alpha.10
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist-server/service/company/company-query.js +2 -2
- package/dist-server/service/company/company-query.js.map +1 -1
- package/dist-server/service/worker/worker-query.js +1 -1
- package/dist-server/service/worker/worker-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/dist-server/utils/get-permitted-bizplaces.js +8 -8
- package/dist-server/utils/get-permitted-bizplaces.js.map +1 -1
- package/package.json +3 -3
- package/server/service/company/company-query.ts +2 -2
- package/server/service/worker/worker-query.ts +1 -1
- package/server/utils/get-permitted-bizplaces.ts +8 -8
|
@@ -14,7 +14,7 @@ let CompanyQuery = class CompanyQuery {
|
|
|
14
14
|
async company(context) {
|
|
15
15
|
const { domain } = context.state;
|
|
16
16
|
const foundCompany = await (0, shell_1.getRepository)(company_1.Company).findOneBy({
|
|
17
|
-
domain
|
|
17
|
+
domain: { id: domain.id }
|
|
18
18
|
});
|
|
19
19
|
if (!foundCompany)
|
|
20
20
|
throw new Error(context.t('error.no x found', { x: context.t('field.company') }));
|
|
@@ -30,7 +30,7 @@ let CompanyQuery = class CompanyQuery {
|
|
|
30
30
|
const { domain, user } = context.state;
|
|
31
31
|
const userDomains = await (0, auth_base_1.getUserDomains)(user);
|
|
32
32
|
const company = await (0, shell_1.getRepository)(company_1.Company).findOneBy({
|
|
33
|
-
domain
|
|
33
|
+
domain: { id: domain.id }
|
|
34
34
|
});
|
|
35
35
|
const [items, total] = await (0, shell_1.getRepository)(bizplace_1.Bizplace).findAndCount({
|
|
36
36
|
where: { company: { id: company.id }, domain: { id: (0, typeorm_1.In)(userDomains.map(({ id }) => id)) } },
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"company-query.js","sourceRoot":"","sources":["../../../server/service/company/company-query.ts"],"names":[],"mappings":";;;;AAAA,+CAAoE;AACpE,qCAA4B;AAE5B,yDAA0F;AAC1F,iDAA2F;AAE3F,mDAA+C;AAC/C,+DAAyD;AACzD,uCAAmC;AACnC,mDAA6C;AAG7C,IAAa,YAAY,GAAzB,MAAa,YAAY;IAGvB,KAAK,CAAC,OAAO,CAAQ,OAAwB;QAC3C,MAAM,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,KAAK,CAAA;QAEhC,MAAM,YAAY,GAAmB,MAAM,IAAA,qBAAa,EAAC,iBAAO,CAAC,CAAC,SAAS,CAAC;YAC1E,MAAM;
|
|
1
|
+
{"version":3,"file":"company-query.js","sourceRoot":"","sources":["../../../server/service/company/company-query.ts"],"names":[],"mappings":"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","sourcesContent":["import { Args, Ctx, Directive, Query, Resolver } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { getDomainUsers, getUserDomains, User, UserList } from '@things-factory/auth-base'\nimport { convertListParams, Domain, getRepository, ListParam } from '@things-factory/shell'\n\nimport { Bizplace } from '../bizplace/bizplace'\nimport { BizplaceList } from '../bizplace/bizplace-types'\nimport { Company } from './company'\nimport { CompanyList } from './company-types'\n\n@Resolver(Company)\nexport class CompanyQuery {\n @Directive('@privilege(category: \"company\", privilege: \"query\", domainOwnerGranted: true)')\n @Query(returns => Company)\n async company(@Ctx() context: ResolverContext): Promise<Company> {\n const { domain } = context.state\n\n const foundCompany: Company | null = await getRepository(Company).findOneBy({\n domain: { id: domain.id }\n })\n\n if (!foundCompany) throw new Error(context.t('error.no x found', { x: context.t('field.company') }))\n return foundCompany\n }\n\n @Directive('@privilege(category: \"company\", privilege: \"query\")')\n @Query(returns => CompanyList)\n async companies(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<CompanyList> {\n const { domain } = context.state\n const convertedParams = convertListParams(params, { domain })\n\n const [items, total] = await getRepository(Company).findAndCount({\n ...convertedParams,\n relations: ['domain', 'creator', 'updater']\n })\n return { items, total }\n }\n\n @Directive('@privilege(category: \"company\", privilege: \"query\", domainOwnerGranted: true)')\n @Query(returns => BizplaceList)\n async companyBizplaces(@Ctx() context: ResolverContext): Promise<BizplaceList> {\n const { domain, user } = context.state\n\n const userDomains: Domain[] = await getUserDomains(user)\n const company: Company = await getRepository(Company).findOneBy({\n domain: { id: domain.id }\n })\n\n const [items, total] = await getRepository(Bizplace).findAndCount({\n where: { company: { id: company.id }, domain: { id: In(userDomains.map(({ id }: Domain) => id)) } },\n relations: ['domain']\n })\n\n return { items, total }\n }\n\n @Directive('@privilege(category: \"company\", privilege: \"query\", domainOwnerGranted: true)')\n @Query(returns => UserList)\n async companyUsers(@Ctx() context: ResolverContext): Promise<UserList> {\n const { domain } = context.state\n\n const items: User[] = await getDomainUsers(domain)\n\n return {\n items,\n total: items.length\n }\n }\n}\n"]}
|
|
@@ -12,7 +12,7 @@ let WorkerQuery = class WorkerQuery {
|
|
|
12
12
|
async worker(name, context) {
|
|
13
13
|
return await (0, shell_1.getRepository)(worker_1.Worker).findOne({
|
|
14
14
|
where: {
|
|
15
|
-
domain: context.state.domain,
|
|
15
|
+
domain: { id: context.state.domain.id },
|
|
16
16
|
name,
|
|
17
17
|
bizplace: (0, typeorm_1.In)(await (0, utils_1.getPermittedBizplaceIds)(context.state.domain, context.state.user))
|
|
18
18
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"worker-query.js","sourceRoot":"","sources":["../../../server/service/worker/worker-query.ts"],"names":[],"mappings":";;;;AAAA,+CAAyE;AACzE,qCAA4B;AAE5B,iDAAmF;AAEnF,uCAAqD;AACrD,qCAAiC;AACjC,iDAA2C;AAG3C,IAAa,WAAW,GAAxB,MAAa,WAAW;IAGtB,KAAK,CAAC,MAAM,CAAc,IAAY,EAAS,OAAwB;QACrE,OAAO,MAAM,IAAA,qBAAa,EAAC,eAAM,CAAC,CAAC,OAAO,CAAC;YACzC,KAAK,EAAE;gBACL,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM;
|
|
1
|
+
{"version":3,"file":"worker-query.js","sourceRoot":"","sources":["../../../server/service/worker/worker-query.ts"],"names":[],"mappings":";;;;AAAA,+CAAyE;AACzE,qCAA4B;AAE5B,iDAAmF;AAEnF,uCAAqD;AACrD,qCAAiC;AACjC,iDAA2C;AAG3C,IAAa,WAAW,GAAxB,MAAa,WAAW;IAGtB,KAAK,CAAC,MAAM,CAAc,IAAY,EAAS,OAAwB;QACrE,OAAO,MAAM,IAAA,qBAAa,EAAC,eAAM,CAAC,CAAC,OAAO,CAAC;YACzC,KAAK,EAAE;gBACL,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,MAAM,CAAC,EAAE,EAAE;gBACvC,IAAI;gBACJ,QAAQ,EAAE,IAAA,YAAE,EAAC,MAAM,IAAA,+BAAuB,EAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACtF;YACD,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC;SACxD,CAAC,CAAA;IACJ,CAAC;IAID,KAAK,CAAC,OAAO,CAAS,MAAiB,EAAS,OAAwB;QACtE,MAAM,eAAe,GAAG,IAAA,yBAAiB,EAAC,MAAM,CAAC,CAAA;QACjD,eAAe,CAAC,KAAK,CAAC,QAAQ,GAAG,IAAA,YAAE,EAAC,MAAM,IAAA,+BAAuB,EAAC,OAAO,CAAC,KAAK,CAAC,MAAM,EAAE,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAA;QAC5G,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,GAAG,MAAM,IAAA,qBAAa,EAAC,eAAM,CAAC,CAAC,YAAY,iCAC1D,eAAe,KAClB,SAAS,EAAE,CAAC,QAAQ,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,CAAC,IACvD,CAAA;QAEF,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,CAAA;IACzB,CAAC;CACF,CAAA;AAvBC;IAFC,IAAA,wBAAS,EAAC,oDAAoD,CAAC;IAC/D,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,eAAM,CAAC;IACX,mBAAA,IAAA,kBAAG,EAAC,MAAM,CAAC,CAAA;IAAgB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;;;yCAS7C;AAID;IAFC,IAAA,wBAAS,EAAC,oDAAoD,CAAC;IAC/D,IAAA,oBAAK,EAAC,OAAO,CAAC,EAAE,CAAC,yBAAU,CAAC;IACd,mBAAA,IAAA,mBAAI,GAAE,CAAA;IAAqB,mBAAA,IAAA,kBAAG,GAAE,CAAA;;6CAAjB,iBAAS;;0CAStC;AAzBU,WAAW;IADvB,IAAA,uBAAQ,EAAC,eAAM,CAAC;GACJ,WAAW,CA0BvB;AA1BY,kCAAW","sourcesContent":["import { Arg, Args, Ctx, Directive, Query, Resolver } from 'type-graphql'\nimport { In } from 'typeorm'\n\nimport { convertListParams, getRepository, ListParam } from '@things-factory/shell'\n\nimport { getPermittedBizplaceIds } from '../../utils'\nimport { Worker } from './worker'\nimport { WorkerList } from './worker-types'\n\n@Resolver(Worker)\nexport class WorkerQuery {\n @Directive('@privilege(category: \"worker\", privilege: \"query\")')\n @Query(returns => Worker)\n async worker(@Arg('name') name: string, @Ctx() context: ResolverContext): Promise<Worker> {\n return await getRepository(Worker).findOne({\n where: {\n domain: { id: context.state.domain.id },\n name,\n bizplace: In(await getPermittedBizplaceIds(context.state.domain, context.state.user))\n },\n relations: ['domain', 'bizplace', 'creator', 'updater']\n })\n }\n\n @Directive('@privilege(category: \"worker\", privilege: \"query\")')\n @Query(returns => WorkerList)\n async workers(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<WorkerList> {\n const convertedParams = convertListParams(params)\n convertedParams.where.bizplace = In(await getPermittedBizplaceIds(context.state.domain, context.state.user))\n const [items, total] = await getRepository(Worker).findAndCount({\n ...convertedParams,\n relations: ['domain', 'bizplace', 'creator', 'updater']\n })\n\n return { items, total }\n }\n}\n"]}
|