@things-factory/transport-base 7.0.0-alpha.8 → 7.0.1-alpha.0
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/transport-driver/transport-driver-query.js +1 -3
- package/dist-server/service/transport-driver/transport-driver-query.js.map +1 -1
- package/dist-server/tsconfig.tsbuildinfo +1 -1
- package/package.json +3 -3
- package/server/service/transport-driver/transport-driver-query.ts +3 -8
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@things-factory/transport-base",
|
|
3
|
-
"version": "7.0.
|
|
3
|
+
"version": "7.0.1-alpha.0",
|
|
4
4
|
"main": "dist-server/index.js",
|
|
5
5
|
"browser": "client/index.js",
|
|
6
6
|
"things-factory": true,
|
|
@@ -24,7 +24,7 @@
|
|
|
24
24
|
"migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
|
|
25
25
|
},
|
|
26
26
|
"dependencies": {
|
|
27
|
-
"@things-factory/biz-base": "^7.0.
|
|
27
|
+
"@things-factory/biz-base": "^7.0.1-alpha.0"
|
|
28
28
|
},
|
|
29
|
-
"gitHead": "
|
|
29
|
+
"gitHead": "d18cdb7648bd2003f11278ec7bc8df74edbd31fc"
|
|
30
30
|
}
|
|
@@ -33,9 +33,7 @@ export class TransportDriverQuery {
|
|
|
33
33
|
.leftJoinAndSelect('TransportDriver.updater', 'Updater')
|
|
34
34
|
|
|
35
35
|
if (filters?.length > 0) {
|
|
36
|
-
queryBuilder
|
|
37
|
-
.andWhere('Domain.id = :domainId', { domainId: domain.id })
|
|
38
|
-
.andWhere('TransportDriver.deletedAt IS NULL')
|
|
36
|
+
queryBuilder.andWhere('Domain.id = :domainId', { domainId: domain.id }).andWhere('TransportDriver.deletedAt IS NULL')
|
|
39
37
|
} else {
|
|
40
38
|
queryBuilder.where('TransportDriver.deletedAt IS NULL').andWhere('Domain.id = :domainId', { domainId: domain.id })
|
|
41
39
|
}
|
|
@@ -48,10 +46,7 @@ export class TransportDriverQuery {
|
|
|
48
46
|
@Directive('@transaction')
|
|
49
47
|
@Directive('@privilege(category: "transport", privilege: "query", domainOwnerGranted: true)')
|
|
50
48
|
@Query(returns => TransportDriver)
|
|
51
|
-
async transportDriver(
|
|
52
|
-
@Arg('driverCode') driverCode: string,
|
|
53
|
-
@Ctx() context: ResolverContext
|
|
54
|
-
): Promise<TransportDriver> {
|
|
49
|
+
async transportDriver(@Arg('driverCode') driverCode: string, @Ctx() context: ResolverContext): Promise<TransportDriver> {
|
|
55
50
|
const { domain, tx } = context.state
|
|
56
51
|
|
|
57
52
|
return await tx.getRepository(TransportDriver).findOne({
|
|
@@ -62,7 +57,7 @@ export class TransportDriverQuery {
|
|
|
62
57
|
@Directive('@transaction')
|
|
63
58
|
@Query(returns => TransportDriver)
|
|
64
59
|
async transportDriverByUser(@Ctx() context: ResolverContext): Promise<TransportDriver> {
|
|
65
|
-
const { domain, tx, user }: { domain: Domain; tx
|
|
60
|
+
const { domain, tx, user }: { domain: Domain; tx?: EntityManager; user: User } = context.state
|
|
66
61
|
|
|
67
62
|
const driver = await tx.getRepository(TransportDriver).findOne({
|
|
68
63
|
where: { domain: { id: domain.id }, user: { id: user.id } }
|