@things-factory/work-shift 6.1.185 → 6.1.186

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/work-shift",
-  "version": "6.1.185",
+  "version": "6.1.186",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,10 +24,10 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^6.1.185",
+    "@things-factory/auth-base": "^6.1.186",
     "@things-factory/env": "^6.1.175",
-    "@things-factory/shell": "^6.1.182",
+    "@things-factory/shell": "^6.1.186",
     "moment-timezone": "^0.5.40"
   },
-  "gitHead": "b6793ed8361e9fc5a4776fb48010007960ffdec8"
+  "gitHead": "ddf508496cdd7d4b9d0e020703a2f7a586a42ec5"
 }

package/server/controllers/index.ts

@@ -1,250 +1,2 @@
-import moment from 'moment-timezone'
-
-import { logger } from '@things-factory/env'
-import { Domain, getRepository } from '@things-factory/shell'
-
-import { WorkShift, WorkShiftDateType } from '../service/work-shift/work-shift'
-import { WorkShiftInfo } from '../service/work-shift/work-shift-type'
-
-export async function getDateRangeForWorkShift(
-  domain: Domain,
-  workDate: string,
-  workShiftName: string,
-  options: { timezone?: string; format?: string }
-): Promise<Date[]> {
-  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
-  const { timezone, format } = dateOptions
-
-  const workShift = await getRepository(WorkShift).findOne({
-    where: {
-      domain: { id: domain.id },
-      name: workShiftName
-    }
-  })
-
-  if (!workShift) {
-    return
-  }
-  const theDay = moment.tz(workDate, timezone)
-  const { name, fromDate, fromTime, toDate, toTime } = workShift
-
-  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()
-
-  return [from, to]
-}
-
-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
-
-  var beginDate
-  var endDate
-
-  /* 1. get work-shift list for the domain */
-  const workShifts = await getRepository(WorkShift).find({
-    where: {
-      domain: { id: domain.id }
-    },
-    order: {
-      fromDate: 'ASC',
-      fromTime: 'ASC'
-    }
-  })
-
-  /* 2. get date-time for every work-shift */
-  if (workShifts && workShifts.length > 0) {
-    const theDay = moment.tz(workDate, timezone)
-
-    for (let j = 0; j < workShifts.length; j++) {
-      const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
-
-      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()
-
-      if (!beginDate) {
-        beginDate = from
-      }
-
-      endDate = to
-    }
-  } else {
-    return
-  }
-
-  /* 3. in case there are no work-shift, just give date and default shift '' */
-  return [beginDate, endDate]
-}
-
-export async function getWorkDateAndShift(domain: Domain, dateTime: Date, options?: any): Promise<WorkShiftInfo> {
-  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
-  const { timezone, format } = dateOptions
-
-  const givenDate = moment(dateTime).tz(timezone)
-  /* 1. get work-shift list for the domain */
-  const workShifts = await getRepository(WorkShift).find({
-    where: {
-      domain: { id: domain.id }
-    },
-    order: {
-      fromDate: 'ASC',
-      fromTime: 'ASC'
-    }
-  })
-
-  /* 2. compare given date-time to every work-shift */
-  const theDay = givenDate.clone().startOf('day')
-  const theDayBefore = theDay.clone().subtract(1, 'day')
-  const theDayAfter = theDay.clone().add(1, 'day')
-
-  if (workShifts && workShifts.length > 0) {
-    const days = [theDayBefore, theDay, theDayAfter]
-    let dateBegin, dateEnd
-
-    for (let i = 0; i < days.length; i++) {
-      const day = days[i]
-      dateBegin = null
-
-      for (let j = 0; j < workShifts.length; j++) {
-        const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
-
-        const convertedFromDate = day.clone().add(fromDate, 'day')
-        const convertedToDate = day.clone().add(toDate, 'day')
-
-        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)
-
-        dateBegin = dateBegin || from
-        dateEnd = from.clone().add(1, 'day')
-
-        if (dateTime >= from.toDate() && to.toDate() > dateTime) {
-          return {
-            workDate: moment(day).format(format),
-            workShift: name,
-            dateRange: [dateBegin.toDate(), dateEnd.toDate()],
-            shiftRange: [from.toDate(), to.toDate()]
-          }
-        }
-      }
-    }
-
-    logger.error(new Error('shift not found'))
-  }
-
-  /* 3. in case there are no work-shift, just give date and default shift '' */
-  return {
-    workDate: givenDate.format(format),
-    workShift: '',
-    dateRange: [theDay.toDate(), theDayAfter.toDate()]
-  }
-}
-
-export async function getLatestWorkDateAndShift(domain: Domain, dateTime: Date, options?: any): Promise<WorkShiftInfo> {
-  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
-  const { timezone, format } = dateOptions
-
-  const givenDate = moment(dateTime).tz(timezone)
-
-  /* 1. get work-shift list for the domain */
-  const workShifts = await getRepository(WorkShift).find({
-    where: {
-      domain: { id: domain.id }
-    },
-    order: {
-      fromDate: 'ASC',
-      fromTime: 'ASC'
-    }
-  })
-
-  /* 2. compare given date-time to every work-shift */
-  const theDay = givenDate.clone().startOf('day')
-  const theDayBefore = theDay.clone().subtract(1, 'day')
-  const theDayAfter = theDay.clone().add(1, 'day')
-
-  if (workShifts && workShifts.length > 0) {
-    const days = [theDayBefore, theDay, theDayAfter]
-    let dateBegin, dateEnd
-
-    for (let i = 0; i < days.length; i++) {
-      const day = days[i]
-      dateBegin = null
-
-      for (let j = 0; j < workShifts.length; j++) {
-        const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
-
-        const convertedFromDate = day.clone().add(fromDate, 'day')
-        const convertedToDate = day.clone().add(toDate, 'day')
-
-        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)
-
-        dateBegin = dateBegin || from
-        dateEnd = from.clone().add(1, 'day')
-
-        if (dateTime < from.toDate()) {
-          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 to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
-
-            return {
-              workDate: moment(day).format(format),
-              workShift: name,
-              dateRange: [dateBegin.toDate(), dateEnd.toDate()],
-              shiftRange: [from.toDate(), to.toDate()]
-            }
-          } else if (i > 0) {
-            const { name, fromDate, fromTime, toDate, toTime } = workShifts[0]
-
-            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 to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
-
-            return {
-              workDate: moment(day).format(format),
-              workShift: name,
-              dateRange: [dateBegin.clone().subtract(1, 'day').toDate(), dateBegin.toDate()],
-              shiftRange: [from.toDate(), to.toDate()]
-            }
-          } else {
-            return
-          }
-        }
-      }
-    }
-
-    logger.error(new Error('shift not found'))
-  }
-
-  /* 3. in case there are no work-shift, just give date and default shift '' */
-  return {
-    workDate: givenDate.clone().subtract(1, 'day').format(format),
-    workShift: '',
-    dateRange: [theDayBefore.toDate(), theDay.toDate()]
-  }
-}
+export * from './work-shift-range'
+export * from './work-shift-schedule'

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

@@ -0,0 +1,250 @@
+import moment from 'moment-timezone'
+
+import { logger } from '@things-factory/env'
+import { Domain, getRepository } from '@things-factory/shell'
+
+import { WorkShift } from '../service/work-shift/work-shift'
+import { WorkShiftInfo } from '../service/work-shift/work-shift-type'
+
+export async function getDateRangeForWorkShift(
+  domain: Domain,
+  workDate: string,
+  workShiftName: string,
+  options: { timezone?: string; format?: string }
+): Promise<Date[]> {
+  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
+  const { timezone, format } = dateOptions
+
+  const workShift = await getRepository(WorkShift).findOne({
+    where: {
+      domain: { id: domain.id },
+      name: workShiftName
+    }
+  })
+
+  if (!workShift) {
+    return
+  }
+  const theDay = moment.tz(workDate, timezone)
+  const { name, fromDate, fromTime, toDate, toTime } = workShift
+
+  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()
+
+  return [from, to]
+}
+
+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
+
+  var beginDate
+  var endDate
+
+  /* 1. get work-shift list for the domain */
+  const workShifts = await getRepository(WorkShift).find({
+    where: {
+      domain: { id: domain.id }
+    },
+    order: {
+      fromDate: 'ASC',
+      fromTime: 'ASC'
+    }
+  })
+
+  /* 2. get date-time for every work-shift */
+  if (workShifts && workShifts.length > 0) {
+    const theDay = moment.tz(workDate, timezone)
+
+    for (let j = 0; j < workShifts.length; j++) {
+      const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
+
+      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()
+
+      if (!beginDate) {
+        beginDate = from
+      }
+
+      endDate = to
+    }
+  } else {
+    return
+  }
+
+  /* 3. in case there are no work-shift, just give date and default shift '' */
+  return [beginDate, endDate]
+}
+
+export async function getWorkDateAndShift(domain: Domain, dateTime: Date, options?: any): Promise<WorkShiftInfo> {
+  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
+  const { timezone, format } = dateOptions
+
+  const givenDate = moment(dateTime).tz(timezone)
+  /* 1. get work-shift list for the domain */
+  const workShifts = await getRepository(WorkShift).find({
+    where: {
+      domain: { id: domain.id }
+    },
+    order: {
+      fromDate: 'ASC',
+      fromTime: 'ASC'
+    }
+  })
+
+  /* 2. compare given date-time to every work-shift */
+  const theDay = givenDate.clone().startOf('day')
+  const theDayBefore = theDay.clone().subtract(1, 'day')
+  const theDayAfter = theDay.clone().add(1, 'day')
+
+  if (workShifts && workShifts.length > 0) {
+    const days = [theDayBefore, theDay, theDayAfter]
+    let dateBegin, dateEnd
+
+    for (let i = 0; i < days.length; i++) {
+      const day = days[i]
+      dateBegin = null
+
+      for (let j = 0; j < workShifts.length; j++) {
+        const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
+
+        const convertedFromDate = day.clone().add(fromDate, 'day')
+        const convertedToDate = day.clone().add(toDate, 'day')
+
+        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)
+
+        dateBegin = dateBegin || from
+        dateEnd = from.clone().add(1, 'day')
+
+        if (dateTime >= from.toDate() && to.toDate() > dateTime) {
+          return {
+            workDate: moment(day).format(format),
+            workShift: name,
+            dateRange: [dateBegin.toDate(), dateEnd.toDate()],
+            shiftRange: [from.toDate(), to.toDate()]
+          }
+        }
+      }
+    }
+
+    logger.error(new Error('shift not found'))
+  }
+
+  /* 3. in case there are no work-shift, just give date and default shift '' */
+  return {
+    workDate: givenDate.format(format),
+    workShift: '',
+    dateRange: [theDay.toDate(), theDayAfter.toDate()]
+  }
+}
+
+export async function getLatestWorkDateAndShift(domain: Domain, dateTime: Date, options?: any): Promise<WorkShiftInfo> {
+  const dateOptions = { timezone: domain.timezone || 'UTC', format: 'YYYY-MM-DD', ...options }
+  const { timezone, format } = dateOptions
+
+  const givenDate = moment(dateTime).tz(timezone)
+
+  /* 1. get work-shift list for the domain */
+  const workShifts = await getRepository(WorkShift).find({
+    where: {
+      domain: { id: domain.id }
+    },
+    order: {
+      fromDate: 'ASC',
+      fromTime: 'ASC'
+    }
+  })
+
+  /* 2. compare given date-time to every work-shift */
+  const theDay = givenDate.clone().startOf('day')
+  const theDayBefore = theDay.clone().subtract(1, 'day')
+  const theDayAfter = theDay.clone().add(1, 'day')
+
+  if (workShifts && workShifts.length > 0) {
+    const days = [theDayBefore, theDay, theDayAfter]
+    let dateBegin, dateEnd
+
+    for (let i = 0; i < days.length; i++) {
+      const day = days[i]
+      dateBegin = null
+
+      for (let j = 0; j < workShifts.length; j++) {
+        const { name, fromDate, fromTime, toDate, toTime } = workShifts[j]
+
+        const convertedFromDate = day.clone().add(fromDate, 'day')
+        const convertedToDate = day.clone().add(toDate, 'day')
+
+        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)
+
+        dateBegin = dateBegin || from
+        dateEnd = from.clone().add(1, 'day')
+
+        if (dateTime < from.toDate()) {
+          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 to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+
+            return {
+              workDate: moment(day).format(format),
+              workShift: name,
+              dateRange: [dateBegin.toDate(), dateEnd.toDate()],
+              shiftRange: [from.toDate(), to.toDate()]
+            }
+          } else if (i > 0) {
+            const { name, fromDate, fromTime, toDate, toTime } = workShifts[0]
+
+            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 to = moment.tz(`${convertedToDate.format('YYYY-MM-DD')} ${toTime}`, 'YYYY-MM-DD HH:mm:ss', timezone)
+
+            return {
+              workDate: moment(day).format(format),
+              workShift: name,
+              dateRange: [dateBegin.clone().subtract(1, 'day').toDate(), dateBegin.toDate()],
+              shiftRange: [from.toDate(), to.toDate()]
+            }
+          } else {
+            return
+          }
+        }
+      }
+    }
+
+    logger.error(new Error('shift not found'))
+  }
+
+  /* 3. in case there are no work-shift, just give date and default shift '' */
+  return {
+    workDate: givenDate.clone().subtract(1, 'day').format(format),
+    workShift: '',
+    dateRange: [theDayBefore.toDate(), theDay.toDate()]
+  }
+}

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

@@ -0,0 +1,79 @@
+import { Domain, getRepository } from '@things-factory/shell'
+
+import { WorkShift } from '../service/work-shift/work-shift'
+
+export async function getSummaryScheduleForWorkShift(domain: Domain): Promise<string> {
+  const workShifts = await getRepository(WorkShift).find({
+    where: {
+      domain: { id: domain.id }
+    }
+  })
+
+  if (!workShifts || workShifts.length == 0) {
+    return ''
+  }
+
+  const hours = workShifts
+    .map(workShift => workShift.toTime)
+    .map(getNextHourIn24HourFormat)
+    .join(',')
+
+  return `10 ${hours} * * * *`
+}
+
+export async function getSummaryScheduleForWorkDate(domain: Domain): Promise<string> {
+  /* 1. 도메인의 워크시프트를 모두 가져온다. */
+  const workShifts = await getRepository(WorkShift).find({
+    where: {
+      domain: { id: domain.id }
+    },
+    order: {
+      fromDate: 'ASC',
+      fromTime: 'ASC'
+    }
+  })
+
+  /* 2. 워크데이의 마지막 시간을 구한 뒤, 그 30분뒤 시간에 매일 수행하는 crontab을 계산한다. */
+  if (workShifts && workShifts.length > 0) {
+    const { toTime } = workShifts[workShifts.length - 1]
+    return timePlusThirtyMinutesToCron(toTime)
+  } else {
+    return
+  }
+}
+
+function timePlusThirtyMinutesToCron(time: string): string {
+  const isPM = time.toUpperCase().includes('PM')
+  const [hours, minutes] = time
+    .toUpperCase()
+    .replace(/(AM|PM)/, '')
+    .split(':')
+    .map(Number)
+
+  // 기준 날짜와 시간 정보를 사용하여 Date 객체를 생성합니다.
+  let date = new Date(1970, 0, 1, isPM ? (hours % 12) + 12 : hours % 12, minutes)
+
+  // 30분을 추가합니다.
+  date.setMinutes(date.getMinutes() + 30)
+
+  // 결과 시간을 얻습니다.
+  const resultHours = String(date.getHours()).padStart(2, '0')
+  const resultMinutes = String(date.getMinutes()).padStart(2, '0')
+
+  // 결과 시간을 사용하여 crontab 항목을 반환합니다.
+  return `${resultMinutes} ${resultHours} * * * *`
+}
+
+function getNextHourIn24HourFormat(time: string): string {
+  const isPM = time.toUpperCase().includes('PM')
+  const hours = Number(time.split(':')[0])
+
+  // 기준 날짜와 시간 정보를 사용하여 Date 객체를 생성합니다.
+  let date = new Date(1970, 0, 1, isPM ? (hours % 12) + 12 : hours % 12, 0)
+
+  // 시간 값을 1 증가시킵니다.
+  date.setHours(date.getHours() + 1)
+
+  // 결과 시간을 얻습니다.
+  return String(date.getHours()).padStart(2, '0')
+}