@things-factory/work-shift 7.0.1-beta.8 → 7.0.1-rc.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/work-shift",
-  "version": "7.0.1-beta.8",
+  "version": "7.0.1-rc.0",
   "main": "dist-server/index.js",
   "browser": "dist-client/index.js",
   "things-factory": true,
@@ -27,10 +27,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^7.0.1-beta.8",
-    "@things-factory/env": "^7.0.1-beta.6",
-    "@things-factory/shell": "^7.0.1-beta.8",
+    "@things-factory/auth-base": "^7.0.1-rc.0",
+    "@things-factory/env": "^7.0.1-rc.0",
+    "@things-factory/shell": "^7.0.1-rc.0",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "d2ca60f7fca6feb2b7cb86b4f825378573fcc335"
+  "gitHead": "45476b164b69aef2c211d9a5257897f42d8e2f5f"
 }

package/server/controllers/work-shift-range.ts

@@ -10,7 +10,7 @@ export async function getDateRangeForWorkShift(
   domain: Domain,
   workDate: string,
   workShiftName: string,
-  options: { timezone?: string; format?: string }
+  options?: { timezone?: string; format?: string }
 ): Promise<Date[]> {
   const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
   const { timezone, format } = dateOptions
@@ -30,13 +30,19 @@ export async function getDateRangeForWorkShift(
 
   const convertedFromDate = theDay.clone().add(fromDate, 'day')
   const convertedToDate = theDay.clone().add(toDate, 'day')
-  const from = moment.tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone).toDate()
+  const from = moment
+    .tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+    .toDate()
   const to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone).toDate()
 
   return [from, to]
 }
 
-export async function getDateRangeForWorkDate(domain: Domain, workDate: string, options: { timezone?: string; format?: string }) {
+export async function getDateRangeForWorkDate(
+  domain: Domain,
+  workDate: string,
+  options?: { timezone?: string; format?: string }
+) {
   const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
   const { timezone, format } = dateOptions
 
@@ -63,8 +69,12 @@ export async function getDateRangeForWorkDate(domain: Domain, workDate: string,
 
       const convertedFromDate = theDay.clone().add(fromDate, 'day')
       const convertedToDate = theDay.clone().add(toDate, 'day')
-      const from = moment.tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone).toDate()
-      const to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone).toDate()
+      const from = moment
+        .tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+        .toDate()
+      const to = moment
+        .tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+        .toDate()
 
       if (!beginDate) {
         beginDate = from
@@ -189,7 +199,11 @@ export async function getLatestWorkDateAndShift(domain: Domain, dateTime: Date,
           if (j > 0) {
             const { name, fromDate, fromTime, toDate, toTime } = workShifts[j - 1]
 
-            const from = moment.tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+            const from = moment.tz(
+              `${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`,
+              'YYYY-MM-DD HH:mm:ss',
+              timezone
+            )
             const to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
 
             return {
@@ -204,7 +218,11 @@ export async function getLatestWorkDateAndShift(domain: Domain, dateTime: Date,
             const convertedFromDate = days[i - 1].clone().add(fromDate, 'day')
             const convertedToDate = days[i - 1].clone().add(toDate, 'day')
 
-            const from = moment.tz(`${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+            const from = moment.tz(
+              `${convertedFromDate.format('YYYY-MM-DD')} ${fromTime}`,
+              'YYYY-MM-DD HH:mm:ss',
+              timezone
+            )
             const to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
 
             return {

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

@@ -33,7 +33,10 @@ export class DomainWorkShiftQuery {
 @Resolver(WorkShift)
 export class WorkShiftQuery {
   @Query(returns => WorkShiftList, { description: 'To fetch multiple WorkShifts' })
-  async workShifts(@Args() params: ListParam, @Ctx() context: ResolverContext): Promise<WorkShiftList> {
+  async workShifts(
+    @Args(type => ListParam) params: ListParam,
+    @Ctx() context: ResolverContext
+  ): Promise<WorkShiftList> {
     const { domain } = context.state
 
     const queryBuilder = getQueryBuilderFromListParams({

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

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