@shisyamo4131/air-guard-v2-schemas 2.2.3-dev.6 → 2.3.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@shisyamo4131/air-guard-v2-schemas",
-  "version": "2.2.3-dev.6",
+  "version": "2.3.1",
   "description": "Schemas for AirGuard V2",
   "type": "module",
   "main": "index.js",

package/src/Agreement.js

@@ -75,12 +75,11 @@
  * - @param {Date} v - The new `dateAt` value
  *****************************************************************************/
 import WorkingResult from "./WorkingResult.js";
-import { DAY_TYPE } from "./constants/day-type.js";
-import { SHIFT_TYPE } from "./constants/shift-type.js";
+import { VALUES as DAY_TYPE } from "./constants/day-type.js";
+import { VALUES as SHIFT_TYPE } from "./constants/shift-type.js";
 import {
-  BILLING_UNIT_TYPE,
-  BILLING_UNIT_TYPE_ARRAY,
-  BILLING_UNIT_TYPE_DEFAULT,
+  VALUES as BILLING_UNIT_TYPE,
+  OPTIONS as BILLING_UNIT_TYPE_OPTIONS,
 } from "./constants/billing-unit-type.js";
 import { defField } from "./parts/fieldDefinitions.js";
 import CutoffDate from "./utils/CutoffDate.js";
@@ -101,12 +100,12 @@ const classProps = {
     required: true,
   }),
   billingUnitType: defField("select", {
-    default: BILLING_UNIT_TYPE_DEFAULT,
+    default: BILLING_UNIT_TYPE.PER_DAY.value,
     label: "請求単位",
     required: true,
     component: {
       attrs: {
-        items: BILLING_UNIT_TYPE_ARRAY,
+        items: BILLING_UNIT_TYPE_OPTIONS,
       },
     },
   }),

package/src/ArrangementNotification.js

@@ -135,10 +135,7 @@
 import SiteOperationScheduleDetail from "./SiteOperationScheduleDetail.js";
 import { getDateAt, ContextualError } from "./utils/index.js";
 import { defField } from "./parts/fieldDefinitions.js";
-import {
-  VALUES,
-  OPTIONS,
-} from "./constants/arrangement-notification-status.js";
+import { VALUES } from "./constants/arrangement-notification-status.js";
 
 const classProps = {
   status: defField("arrangementNotificationStatus", { required: true }),
@@ -168,12 +165,7 @@ export default class ArrangementNotification extends SiteOperationScheduleDetail
   static logicalDelete = false;
   static classProps = classProps;
 
-  static STATUSES = VALUES;
-  static STATUS_ARRANGED = VALUES.ARRANGED.value;
-  static STATUS_CONFIRMED = VALUES.CONFIRMED.value;
-  static STATUS_ARRIVED = VALUES.ARRIVED.value;
-  static STATUS_LEAVED = VALUES.LEAVED.value;
-  static STATUS_OPTIONS = OPTIONS;
+  static STATUS = VALUES;
 
   afterInitialize(item = {}) {
     // Define computed properties that are defined on SiteOperationScheduleDetail

package/src/Operation.js

@@ -133,8 +133,8 @@
 import WorkingResult from "./WorkingResult.js";
 import OperationDetail from "./OperationDetail.js";
 import { defField } from "./parts/fieldDefinitions.js";
-import { DAY_TYPE } from "./constants/day-type.js";
-import { SHIFT_TYPE } from "./constants/shift-type.js";
+import { VALUES as DAY_TYPE } from "./constants/day-type.js";
+import { VALUES as SHIFT_TYPE } from "./constants/shift-type.js";
 
 const classProps = {
   siteId: defField("siteId", { required: true }),
@@ -177,12 +177,7 @@ export default class Operation extends WorkingResult {
   static classProps = classProps;
 
   static DAY_TYPE = DAY_TYPE;
-  static DAY_TYPE_DAY = DAY_TYPE.DAY;
-  static DAY_TYPE_NIGHT = DAY_TYPE.NIGHT;
-
   static SHIFT_TYPE = SHIFT_TYPE;
-  static SHIFT_TYPE_DAY = SHIFT_TYPE.DAY.value;
-  static SHIFT_TYPE_NIGHT = SHIFT_TYPE.NIGHT.value;
 
   /**
    * Constructor

package/src/OperationResult.js

@@ -179,7 +179,7 @@ import { ContextualError } from "./utils/ContextualError.js";
 import OperationResultDetail from "./OperationResultDetail.js";
 import { defField } from "./parts/fieldDefinitions.js";
 import Tax from "./Tax.js";
-import { BILLING_UNIT_TYPE_PER_HOUR } from "./constants/billing-unit-type.js";
+import { VALUES as BILLING_UNIT_TYPE } from "./constants/billing-unit-type.js";
 import RoundSetting from "./RoundSetting.js";
 import CutoffDate from "./utils/CutoffDate.js";
 import Site from "./Site.js";
@@ -247,6 +247,7 @@ export default class OperationResult extends Operation {
     { title: "現場", key: "siteId", value: "siteId" },
   ];
 
+  static BILLING_UNIT_TYPE = BILLING_UNIT_TYPE;
   /**
    * afterInitialize
    */
@@ -343,7 +344,8 @@ export default class OperationResult extends Operation {
             } else {
               // agreementがある場合のみbillingUnitTypeとincludeBreakInBillingを使用
               const isPerHour =
-                this.agreement?.billingUnitType === BILLING_UNIT_TYPE_PER_HOUR;
+                this.agreement?.billingUnitType ===
+                BILLING_UNIT_TYPE.PER_HOUR.value;
 
               if (isPerHour) {
                 // 時間単位請求の場合

package/src/constants/arrangement-notification-status.js

@@ -5,28 +5,28 @@
 export const VALUES = Object.freeze({
   ARRANGED: {
     value: "ARRANGED",
-    label: "配置済",
+    title: "配置済",
     order: 1,
     color: "#F57C00", // 🟠 配置通知済み（待機中）
   },
 
   CONFIRMED: {
     value: "CONFIRMED",
-    label: "確認済",
+    title: "確認済",
     order: 2,
     color: "#2196F3", // 🔵 作業員が了承済み（準備中）
   },
 
   ARRIVED: {
     value: "ARRIVED",
-    label: "上番済",
+    title: "上番済",
     order: 3,
     color: "#4CAF50", // 🟢 現場到着、作業開始可能
   },
 
   LEAVED: {
     value: "LEAVED",
-    label: "下番済",
+    title: "下番済",
     order: 4,
     color: "#607D8B", // ⚫ 作業完了、離脱済み
   },
@@ -37,7 +37,7 @@ export const VALUES = Object.freeze({
    */
   // CANCELED: {
   //   value: "CANCELED",
-  //   label: "現着中止",
+  //   title: "現着中止",
   //   order: 5,
   //   color: "#F44336", // 🔴 異常状態、作業中止
   // },
@@ -45,24 +45,24 @@ export const VALUES = Object.freeze({
 
 export const OPTIONS = [
   {
-    title: VALUES.ARRANGED.label,
+    title: VALUES.ARRANGED.title,
     value: VALUES.ARRANGED.value,
     color: VALUES.ARRANGED.color,
   },
   {
-    title: VALUES.CONFIRMED.label,
+    title: VALUES.CONFIRMED.title,
     value: VALUES.CONFIRMED.value,
     color: VALUES.CONFIRMED.color,
   },
   {
-    title: VALUES.ARRIVED.label,
+    title: VALUES.ARRIVED.title,
     value: VALUES.ARRIVED.value,
     color: VALUES.ARRIVED.color,
   },
   {
-    title: VALUES.LEAVED.label,
+    title: VALUES.LEAVED.title,
     value: VALUES.LEAVED.value,
     color: VALUES.LEAVED.color,
   },
-  // { title: VALUES.CANCELED.label, value: VALUES.CANCELED.value },
+  // { title: VALUES.CANCELED.title, value: VALUES.CANCELED.value },
 ];

package/src/constants/billing-unit-type.js

@@ -1,15 +1,10 @@
 // prettier-ignore
-export const BILLING_UNIT_TYPE_DEFAULT = "PER_DAY";
-export const BILLING_UNIT_TYPE_PER_DAY = "PER_DAY";
-export const BILLING_UNIT_TYPE_PER_HOUR = "PER_HOUR";
-
-export const BILLING_UNIT_TYPE = Object.freeze({
-  PER_DAY: "日",
-  PER_HOUR: "時間",
+export const VALUES = Object.freeze({
+  PER_DAY: { value: "PER_DAY", title: "日" },
+  PER_HOUR: { value: "PER_HOUR", title: "時間" },
 });
 
-export const BILLING_UNIT_TYPE_ARRAY = Object.entries(BILLING_UNIT_TYPE).map(
-  ([key, value]) => {
-    return { value: key, title: value };
-  }
-);
+export const OPTIONS = [
+  { title: VALUES.PER_DAY.title, value: VALUES.PER_DAY.value },
+  { title: VALUES.PER_HOUR.title, value: VALUES.PER_HOUR.value },
+];

package/src/constants/day-type.js

@@ -1,22 +1,19 @@
 // prettier-ignore
 import holiday_jp from "@holiday-jp/holiday_jp";
 
-export const DAY_TYPE_DEFAULT = "WEEKDAY";
-export const DAY_TYPE_WEEKDAY = "WEEKDAY";
-export const DAY_TYPE_SATURDAY = "SATURDAY";
-export const DAY_TYPE_SUNDAY = "SUNDAY";
-export const DAY_TYPE_HOLIDAY = "HOLIDAY";
-
-export const DAY_TYPE = Object.freeze({
-  WEEKDAY: "平日",
-  SATURDAY: "土曜",
-  SUNDAY: "日曜",
-  HOLIDAY: "祝日",
+export const VALUES = Object.freeze({
+  WEEKDAY: { value: "WEEKDAY", title: "平日" },
+  SATURDAY: { value: "SATURDAY", title: "土曜" },
+  SUNDAY: { value: "SUNDAY", title: "日曜" },
+  HOLIDAY: { value: "HOLIDAY", title: "祝日" },
 });
 
-export const DAY_TYPE_ARRAY = Object.entries(DAY_TYPE).map(([key, value]) => {
-  return { value: key, title: value };
-});
+export const OPTIONS = [
+  { title: VALUES.WEEKDAY.title, value: VALUES.WEEKDAY.value },
+  { title: VALUES.SATURDAY.title, value: VALUES.SATURDAY.value },
+  { title: VALUES.SUNDAY.title, value: VALUES.SUNDAY.value },
+  { title: VALUES.HOLIDAY.title, value: VALUES.HOLIDAY.value },
+];
 
 /**
  * Returns the corresponding day type based on the given date's day of the week.
@@ -33,12 +30,12 @@ export const getDayType = (date) => {
     throw new TypeError("Input must be a Date object");
   }
   if (holiday_jp.isHoliday(date)) {
-    return DAY_TYPE_HOLIDAY;
+    return VALUES.HOLIDAY.value;
   } else if (date.getDay() === 0) {
-    return DAY_TYPE_SUNDAY;
+    return VALUES.SUNDAY.value;
   } else if (date.getDay() === 6) {
-    return DAY_TYPE_SATURDAY;
+    return VALUES.SATURDAY.value;
   } else {
-    return DAY_TYPE_WEEKDAY;
+    return VALUES.WEEKDAY.value;
   }
 };

package/src/constants/gender.js

@@ -1,11 +1,10 @@
 // prettier-ignore
-export const GENDER_DEFAULT = "MALE";
-
-export const GENDER = Object.freeze({
-  MALE: "男性",
-  FEMALE: "女性",
+export const VALUES = Object.freeze({
+  MALE: { value: "MALE", title: "男性" },
+  FEMALE: { value: "FEMALE", title: "女性" },
 });
 
-export const GENDER_ARRAY = Object.entries(GENDER).map(([key, value]) => {
-  return { value: key, title: value };
-});
+export const OPTIONS = [
+  { title: VALUES.MALE.title, value: VALUES.MALE.value },
+  { title: VALUES.FEMALE.title, value: VALUES.FEMALE.value },
+];

package/src/constants/index.js

@@ -1,9 +1,38 @@
-export * from "./arrangement-notification-status.js";
-export * from "./billing-unit-type.js";
-export * from "./contract-status.js";
-export * from "./day-type.js";
-export * from "./employment-status.js";
-export * from "./gender.js";
-export * from "./prefectures.js";
-export * from "./shift-type.js";
-export * from "./site-status.js";
+export {
+  VALUES as ARRANGEMENT_NOTIFICATION_STATUS_VALUES,
+  OPTIONS as ARRANGEMENT_NOTIFICATION_STATUS_OPTIONS,
+} from "./arrangement-notification-status.js";
+export {
+  VALUES as BILLING_UNIT_TYPE_VALUES,
+  OPTIONS as BILLING_UNIT_TYPE_OPTIONS,
+} from "./billing-unit-type.js";
+export {
+  VALUES as CONTRACT_STATUS_VALUES,
+  OPTIONS as CONTRACT_STATUS_OPTIONS,
+} from "./contract-status.js";
+export {
+  VALUES as DAY_TYPE_VALUES,
+  OPTIONS as DAY_TYPE_OPTIONS,
+  getDayType,
+} from "./day-type.js";
+export {
+  VALUES as EMPLOYMENT_STATUS_VALUES,
+  OPTIONS as EMPLOYMENT_STATUS_OPTIONS,
+} from "./employment-status.js";
+export {
+  VALUES as GENDER_VALUES,
+  OPTIONS as GENDER_OPTIONS,
+} from "./gender.js";
+export {
+  VALUES as PREFECTURES_VALUES,
+  OPTIONS as PREFECTURES_OPTIONS,
+} from "./prefectures.js";
+export {
+  VALUES as SHIFT_TYPE_VALUES,
+  OPTIONS as SHIFT_TYPE_OPTIONS,
+  VALIDATOR as SHIFT_TYPE_VALIDATOR,
+} from "./shift-type.js";
+export {
+  VALUES as SITE_STATUS_VALUES,
+  OPTIONS as SITE_STATUS_OPTIONS,
+} from "./site-status.js";

package/src/constants/prefectures.js

@@ -1,56 +1,56 @@
 // prettier-ignore
-export const PREFECTURES = Object.freeze({
-  "01": { name: "北海道" },
-  "02": { name: "青森県" },
-  "03": { name: "岩手県" },
-  "04": { name: "宮城県" },
-  "05": { name: "秋田県" },
-  "06": { name: "山形県" },
-  "07": { name: "福島県" },
-  "08": { name: "茨城県" },
-  "09": { name: "栃木県" },
-  "10": { name: "群馬県" },
-  "11": { name: "埼玉県" },
-  "12": { name: "千葉県" },
-  "13": { name: "東京都" },
-  "14": { name: "神奈川県" },
-  "15": { name: "新潟県" },
-  "16": { name: "富山県" },
-  "17": { name: "石川県" },
-  "18": { name: "福井県" },
-  "19": { name: "山梨県" },
-  "20": { name: "長野県" },
-  "21": { name: "岐阜県" },
-  "22": { name: "静岡県" },
-  "23": { name: "愛知県" },
-  "24": { name: "三重県" },
-  "25": { name: "滋賀県" },
-  "26": { name: "京都府" },
-  "27": { name: "大阪府" },
-  "28": { name: "兵庫県" },
-  "29": { name: "奈良県" },
-  "30": { name: "和歌山県" },
-  "31": { name: "鳥取県" },
-  "32": { name: "島根県" },
-  "33": { name: "岡山県" },
-  "34": { name: "広島県" },
-  "35": { name: "山口県" },
-  "36": { name: "徳島県" },
-  "37": { name: "香川県" },
-  "38": { name: "愛媛県" },
-  "39": { name: "高知県" },
-  "40": { name: "福岡県" },
-  "41": { name: "佐賀県" },
-  "42": { name: "長崎県" },
-  "43": { name: "熊本県" },
-  "44": { name: "大分県" },
-  "45": { name: "宮崎県" },
-  "46": { name: "鹿児島県" },
-  "47": { name: "沖縄県" },
+export const VALUES = Object.freeze({
+  "01": { value: "01", title: "北海道" },
+  "02": { value: "02", title: "青森県" },
+  "03": { value: "03", title: "岩手県" },
+  "04": { value: "04", title: "宮城県" },
+  "05": { value: "05", title: "秋田県" },
+  "06": { value: "06", title: "山形県" },
+  "07": { value: "07", title: "福島県" },
+  "08": { value: "08", title: "茨城県" },
+  "09": { value: "09", title: "栃木県" },
+  "10": { value: "10", title: "群馬県" },
+  "11": { value: "11", title: "埼玉県" },
+  "12": { value: "12", title: "千葉県" },
+  "13": { value: "13", title: "東京都" },
+  "14": { value: "14", title: "神奈川県" },
+  "15": { value: "15", title: "新潟県" },
+  "16": { value: "16", title: "富山県" },
+  "17": { value: "17", title: "石川県" },
+  "18": { value: "18", title: "福井県" },
+  "19": { value: "19", title: "山梨県" },
+  "20": { value: "20", title: "長野県" },
+  "21": { value: "21", title: "岐阜県" },
+  "22": { value: "22", title: "静岡県" },
+  "23": { value: "23", title: "愛知県" },
+  "24": { value: "24", title: "三重県" },
+  "25": { value: "25", title: "滋賀県" },
+  "26": { value: "26", title: "京都府" },
+  "27": { value: "27", title: "大阪府" },
+  "28": { value: "28", title: "兵庫県" },
+  "29": { value: "29", title: "奈良県" },
+  "30": { value: "30", title: "和歌山県" },
+  "31": { value: "31", title: "鳥取県" },
+  "32": { value: "32", title: "島根県" },
+  "33": { value: "33", title: "岡山県" },
+  "34": { value: "34", title: "広島県" },
+  "35": { value: "35", title: "山口県" },
+  "36": { value: "36", title: "徳島県" },
+  "37": { value: "37", title: "香川県" },
+  "38": { value: "38", title: "愛媛県" },
+  "39": { value: "39", title: "高知県" },
+  "40": { value: "40", title: "福岡県" },
+  "41": { value: "41", title: "佐賀県" },
+  "42": { value: "42", title: "長崎県" },
+  "43": { value: "43", title: "熊本県" },
+  "44": { value: "44", title: "大分県" },
+  "45": { value: "45", title: "宮崎県" },
+  "46": { value: "46", title: "鹿児島県" },
+  "47": { value: "47", title: "沖縄県" },
 });
 
-export const PREFECTURES_ARRAY = Object.entries(PREFECTURES)
+export const OPTIONS = Object.entries(VALUES)
   .sort((a, b) => a[0].localeCompare(b[0])) // キー（都道府県コード）でソート
   .map(([key, value]) => {
-    return { value: key, title: value.name };
+    return { value: key, title: value.title };
   });

package/src/constants/shift-type.js

@@ -1,20 +1,14 @@
 // prettier-ignore
-export const SHIFT_TYPE_DEFAULT = "DAY";
-export const SHIFT_TYPE_DAY = "DAY";
-export const SHIFT_TYPE_NIGHT = "NIGHT";
-
-export const SHIFT_TYPE = Object.freeze({
+export const VALUES = Object.freeze({
   DAY: { value: "DAY", title: "日勤", color: "deep-orange" },
   NIGHT: { value: "NIGHT", title: "夜勤", color: "indigo" },
 });
 
-export const SHIFT_TYPE_ARRAY = Object.entries(SHIFT_TYPE).map(
-  ([key, value]) => {
-    return { value: key, title: value.title, color: value.color };
-  }
-);
+export const OPTIONS = [
+  { title: VALUES.DAY.title, value: VALUES.DAY.value },
+  { title: VALUES.NIGHT.title, value: VALUES.NIGHT.value },
+];
 
-export const SHIFT_TYPE_VALIDATOR = (value) => {
-  const arr = Object.keys(SHIFT_TYPE);
-  return arr.includes(value);
+export const VALIDATOR = (value) => {
+  return Object.keys(VALUES).includes(value);
 };

package/src/parts/accessorDefinitions.js

@@ -1,4 +1,4 @@
-import { PREFECTURES_ARRAY } from "../constants/prefectures.js";
+import { OPTIONS } from "../constants/prefectures.js";
 /**
  * @typedef {object} AccessorImplementation - アクセサの実装を定義するオブジェクト。
  * @property {function} get - getter関数。
@@ -54,20 +54,18 @@ const accessorImplementations = {
 
       if (!this.prefCode) return ""; // No warning if prefCode is falsy but present
 
-      const result = PREFECTURES_ARRAY.find(
-        ({ value }) => value === this.prefCode
-      );
+      const result = OPTIONS.find(({ value }) => value === this.prefCode);
 
       if (!result) {
         console.warn(
-          `[アクセサ: prefecture] prefCode '${this.prefCode}' は PREFECTURES_ARRAY に見つかりません。`
+          `[アクセサ: prefecture] prefCode '${this.prefCode}' は OPTIONS に見つかりません。`
         );
         return "";
       }
 
       if (!result.hasOwnProperty("title")) {
         console.warn(
-          `[アクセサ: prefecture] PREFECTURES_ARRAY の prefCode '${this.prefCode}' に title が定義されていません。`
+          `[アクセサ: prefecture] OPTIONS の prefCode '${this.prefCode}' に title が定義されていません。`
         );
         return "";
       }

package/src/parts/fieldDefinitions.js

@@ -6,16 +6,22 @@ import {
   VALUES as CONTRACT_STATUS_VALUES,
   OPTIONS as CONTRACT_STATUS_OPTIONS,
 } from "../constants/contract-status.js";
-import { DAY_TYPE_ARRAY, DAY_TYPE_DEFAULT } from "../constants/day-type.js";
+import {
+  OPTIONS as DAY_TYPE_OPTIONS,
+  VALUES as DAY_TYPE_VALUES,
+} from "../constants/day-type.js";
 import {
   VALUES as EMPLOYMENT_STATUS_VALUES,
   OPTIONS as EMPLOYMENT_STATUS_OPTIONS,
 } from "../constants/employment-status.js";
-import { GENDER_ARRAY, GENDER_DEFAULT } from "../constants/gender.js";
-import { PREFECTURES_ARRAY } from "../constants/prefectures.js";
 import {
-  SHIFT_TYPE_ARRAY,
-  SHIFT_TYPE_DEFAULT,
+  VALUES as GENDER_VALUES,
+  OPTIONS as GENDER_OPTIONS,
+} from "../constants/gender.js";
+import { OPTIONS as PREFECTURES_OPTIONS } from "../constants/prefectures.js";
+import {
+  VALUES as SHIFT_TYPE_VALUES,
+  OPTIONS as SHIFT_TYPE_OPTIONS,
 } from "../constants/shift-type.js";
 import {
   VALUES as SITE_STATUS_VALUES,
@@ -412,12 +418,12 @@ export const fieldDefinitions = {
   },
   dayType: {
     ...generalDefinitions.select,
-    default: DAY_TYPE_DEFAULT,
+    default: DAY_TYPE_VALUES.WEEKDAY.value,
     label: "曜日区分",
     component: {
       name: generalDefinitions.select.component.name,
       attrs: {
-        items: DAY_TYPE_ARRAY,
+        items: DAY_TYPE_OPTIONS,
       },
     },
   },
@@ -434,12 +440,12 @@ export const fieldDefinitions = {
   },
   gender: {
     ...generalDefinitions.select,
-    default: GENDER_DEFAULT,
+    default: GENDER_VALUES.MALE.value,
     label: "性別",
     component: {
       name: generalDefinitions.select.component.name,
       attrs: {
-        items: GENDER_ARRAY,
+        items: GENDER_OPTIONS,
       },
     },
   },
@@ -450,18 +456,18 @@ export const fieldDefinitions = {
     component: {
       name: generalDefinitions.select.component.name,
       attrs: {
-        items: PREFECTURES_ARRAY,
+        items: PREFECTURES_OPTIONS,
       },
     },
   },
   shiftType: {
     ...generalDefinitions.select,
-    default: SHIFT_TYPE_DEFAULT,
+    default: SHIFT_TYPE_VALUES.DAY.value,
     label: "勤務区分",
     component: {
       name: generalDefinitions.select.component.name,
       attrs: {
-        items: SHIFT_TYPE_ARRAY,
+        items: SHIFT_TYPE_OPTIONS,
       },
     },
   },