@things-factory/work-shift 5.0.11 → 6.0.0-alpha.3

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@things-factory/work-shift",
-  "version": "5.0.11",
+  "version": "6.0.0-alpha.3",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
   "license": "MIT",
-  "author": "heartyoh",
+  "author": "heartyoh <heartyoh@hatiolab.com>",
   "description": "Module to handle work shift",
   "publishConfig": {
     "access": "public",
@@ -24,9 +24,9 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^5.0.11",
-    "@things-factory/env": "^5.0.0",
-    "@things-factory/shell": "^5.0.11"
+    "@things-factory/auth-base": "^6.0.0-alpha.3",
+    "@things-factory/env": "^6.0.0-alpha.3",
+    "@things-factory/shell": "^6.0.0-alpha.3"
   },
-  "gitHead": "37cd4feb62e062899cae7029588d86a5d4b4036a"
+  "gitHead": "1e273b6485662da938cae8fdca035d994ef4a95d"
 }

package/server/controllers/index.ts

@@ -1,8 +1,7 @@
 import moment from 'moment-timezone'
-import { getRepository } from 'typeorm'
 
 import { logger } from '@things-factory/env'
-import { Domain } from '@things-factory/shell'
+import { Domain, getRepository } from '@things-factory/shell'
 
 import { WorkShift, WorkShiftDateType } from '../service/work-shift/work-shift'
 import { WorkDateWorkShiftPair } from '../service/work-shift/work-shift-type'

package/server/service/work-shift/work-shift-mutation.ts

@@ -1,5 +1,6 @@
-import { Resolver, Mutation, Arg, Ctx, Directive } from 'type-graphql'
+import { Arg, Ctx, Directive, Mutation, Resolver } from 'type-graphql'
 import { In } from 'typeorm'
+
 import { WorkShift } from './work-shift'
 import { WorkShiftPatch } from './work-shift-type'
 
@@ -10,7 +11,7 @@ export class WorkShiftMutation {
   @Mutation(returns => [WorkShift], { description: "To modify multiple WorkShifts' information" })
   async updateMultipleWorkShift(
     @Arg('patches', type => [WorkShiftPatch]) patches: WorkShiftPatch[],
-    @Ctx() context: any
+    @Ctx() context: ResolverContext
   ): Promise<WorkShift[]> {
     const { domain, user, tx } = context.state
 
@@ -38,11 +39,14 @@ export class WorkShiftMutation {
   @Directive('@privilege(category: "system", privilege: "mutation", domainOwnerGranted: true)')
   @Directive('@transaction')
   @Mutation(returns => Boolean, { description: 'To delete multiple workShifts' })
-  async deleteWorkShifts(@Arg('ids', type => [String]) ids: string[], @Ctx() context: any): Promise<boolean> {
+  async deleteWorkShifts(
+    @Arg('ids', type => [String]) ids: string[],
+    @Ctx() context: ResolverContext
+  ): Promise<boolean> {
     const { domain, tx } = context.state
 
     await tx.getRepository(WorkShift).delete({
-      domain,
+      domain: { id: domain.id },
       id: In(ids)
     })
 

package/server/service/work-shift/work-shift-query.ts

@@ -1,8 +1,7 @@
 import { Arg, Args, Ctx, FieldResolver, Query, Resolver, Root } from 'type-graphql'
-import { getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
-import { Domain, getQueryBuilderFromListParams, ListParam } from '@things-factory/shell'
+import { Domain, getQueryBuilderFromListParams, getRepository, ListParam } from '@things-factory/shell'
 
 import { getWorkDateAndShift } from '../../controllers/index'
 import { WorkShift } from './work-shift'
@@ -11,7 +10,10 @@ import { WorkDateWorkShiftPair, WorkShiftList } from './work-shift-type'
 @Resolver(Domain)
 export class DomainWorkShiftQuery {
   @Query(returns => WorkDateWorkShiftPair, { description: 'To fetch a work date and work shift for given datetime' })
-  async getWorkDateAndShift(@Arg('dateTime') dateTime: Date, @Ctx() context: any): Promise<WorkDateWorkShiftPair> {
+  async getWorkDateAndShift(
+    @Arg('dateTime') dateTime: Date,
+    @Ctx() context: ResolverContext
+  ): Promise<WorkDateWorkShiftPair> {
     const { domain } = context.state
 
     return await getWorkDateAndShift(domain, dateTime)
@@ -34,7 +36,7 @@ export class DomainWorkShiftQuery {
 @Resolver(WorkShift)
 export class WorkShiftQuery {
   @Query(returns => WorkShiftList, { description: 'To fetch multiple WorkShifts' })
-  async workShifts(@Args() params: ListParam, @Ctx() context: any): Promise<WorkShiftList> {
+  async workShifts(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<WorkShiftList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({
@@ -50,16 +52,16 @@ export class WorkShiftQuery {
 
   @FieldResolver(type => Domain)
   async domain(@Root() workShift: WorkShift): Promise<Domain> {
-    return await getRepository(Domain).findOne(workShift.domainId)
+    return await getRepository(Domain).findOneBy({ id: workShift.domainId })
   }
 
   @FieldResolver(type => User)
   async updater(@Root() workShift: WorkShift): Promise<User> {
-    return await getRepository(User).findOne(workShift.updaterId)
+    return await getRepository(User).findOneBy({ id: workShift.updaterId })
   }
 
   @FieldResolver(type => User)
   async creator(@Root() workShift: WorkShift): Promise<User> {
-    return await getRepository(User).findOne(workShift.creatorId)
+    return await getRepository(User).findOneBy({ id: workShift.creatorId })
   }
 }