@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.9 → 2.3.8-dev.0

package/src/OperationResult.js

@@ -542,13 +542,19 @@ export default class OperationResult extends Operation {
 
   /**
    * Synchronize customerId and apply (re-apply) agreement from siteId
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    * @returns {Promise<void>}
    * @throws {Error} If the specified siteId does not exist
    */
-  async _syncCustomerIdAndApplyAgreement() {
+  async _syncCustomerIdAndApplyAgreement(args = {}) {
     if (!this.siteId) return;
     const siteInstance = new Site();
-    const siteExists = await siteInstance.fetch({ docId: this.siteId });
+    const siteExists = await siteInstance.fetch({
+      ...args,
+      docId: this.siteId,
+    });
     if (!siteExists) {
       throw new Error(
         `[OperationResult] The specified siteId (${this.siteId}) does not exist.`
@@ -560,10 +566,16 @@ export default class OperationResult extends Operation {
 
   /**
    * Override beforeCreate to sync customerId
+   * @param {Object} args - Creation options.
+   * @param {string} [args.docId] - Document ID to use (optional).
+   * @param {boolean} [args.useAutonumber=true] - Whether to use auto-numbering.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    * @returns {Promise<void>}
    */
-  async beforeCreate() {
-    await super.beforeCreate();
+  async beforeCreate(args = {}) {
+    await super.beforeCreate(args);
 
     // Sync customerId and apply agreement
     await this._syncCustomerIdAndApplyAgreement();
@@ -571,10 +583,14 @@ export default class OperationResult extends Operation {
 
   /**
    * Override beforeUpdate to sync customerId and apply agreement if key changed
+   * @param {Object} args - Creation options.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    * @returns {Promise<void>}
    */
-  async beforeUpdate() {
-    await super.beforeUpdate();
+  async beforeUpdate(args = {}) {
+    await super.beforeUpdate(args);
 
     // Prevent editing if isLocked is true
     if (this.isLocked) {
@@ -590,12 +606,15 @@ export default class OperationResult extends Operation {
 
   /**
    * Override beforeDelete to prevent deletion if isLocked is true
+   * @param {Object} args - Creation options.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    * @returns {Promise<void>}
    * @throws {Error} If isLocked is true
    */
-  async beforeDelete() {
-    await super.beforeDelete();
-
+  async beforeDelete(args = {}) {
+    await super.beforeDelete(args);
     // Prevent deletion if isLocked is true
     if (this.isLocked) {
       throw new Error(

package/src/Site.js

@@ -5,26 +5,32 @@
  * @update 2025-11-20 version 0.2.0-bata
  *                    - Prevent changing customer reference on update.
  *                    - Move `customer` property to the top of classProps for better visibility.
+ *
+ * NOTE: `customer` プロパティについて
+ * 自身の従属先データを持たせる場合に `XxxxxMinimal` クラスを使用するが、アプリ側でオブジェクト選択を行う場合に
+ * `Xxxxx` クラスにするのか `XxxxxMinimal` クラスにするのかを判断できないため、docId を持たせて
+ * `beforeCreate` フックでオブジェクトを取得するようにする。
+ * 尚、取引先は変更できない仕様。
  */
 import { default as FireModel } from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
 import { defAccessor } from "./parts/accessorDefinitions.js";
-import { CustomerMinimal } from "./Customer.js";
-import { fetchDocsApi } from "./apis/index.js";
+import Customer from "./Customer.js";
 import Agreement from "./Agreement.js";
 import { VALUES } from "./constants/site-status.js";
 
 const classProps = {
-  customer: defField("customer", {
+  customerId: defField("customerId", {
     required: true,
-    customClass: CustomerMinimal,
     component: {
       attrs: {
-        api: () => fetchDocsApi(CustomerMinimal),
-        noFilter: true,
+        disabled: ({ editMode }) => {
+          return editMode !== "CREATE";
+        },
       },
     },
   }),
+  customer: defField("customer", { hidden: true, customClass: Customer }),
   code: defField("code", { label: "現場コード" }),
   name: defField("name", {
     label: "現場名",
@@ -115,15 +121,46 @@ export default class Site extends FireModel {
     { title: "取引先名", key: "customer.name", value: "customer.name" },
   ];
 
+  static STATUS = VALUES;
   static STATUS_ACTIVE = VALUES.ACTIVE.value;
   static STATUS_TERMINATED = VALUES.TERMINATED.value;
 
+  /**
+   * Overrides to fetch and set the customer object before creation.
+   * @param {Object} args - Creation options.
+   * @param {string} [args.docId] - Document ID to use (optional).
+   * @param {boolean} [args.useAutonumber=true] - Whether to use auto-numbering.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
+   * @returns {Promise<void>}
+   */
+  async beforeCreate(args = {}) {
+    await super.beforeCreate(args);
+    if (!this.customerId) return;
+    const customerInstance = new Customer();
+    const isExist = await customerInstance.fetch({
+      ...args,
+      docId: this.customerId,
+    });
+    if (!isExist) {
+      return Promise.reject(
+        new Error("Invalid customerId: Customer does not exist.")
+      );
+    }
+    this.customer = customerInstance;
+  }
+
   /**
    * Override beforeUpdate to prevent changing customer reference.
+   * @param {Object} args - Creation options.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    * @returns {Promise<void>}
    */
-  async beforeUpdate() {
-    await super.beforeUpdate();
+  async beforeUpdate(args = {}) {
+    await super.beforeUpdate(args);
     if (this.customer.docId !== this._beforeData.customer.docId) {
       return Promise.reject(
         new Error("Not allowed to change customer reference.")
@@ -135,7 +172,7 @@ export default class Site extends FireModel {
     super.afterInitialize(item);
 
     Object.defineProperties(this, {
-      customerId: defAccessor("customerId"),
+      // customerId: defAccessor("customerId"),
       fullAddress: defAccessor("fullAddress"),
       prefecture: defAccessor("prefecture"),
     });

package/src/SiteOperationSchedule.js

@@ -385,27 +385,35 @@ export default class SiteOperationSchedule extends Operation {
   /**
    * Override `beforeUpdate`.
    * - Prevents updates if an associated OperationResult exists.
+   * @param {Object} args - Creation options.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    */
-  async beforeUpdate() {
+  async beforeUpdate(args = {}) {
     if (this._beforeData.operationResultId) {
       throw new Error(
         `Could not update this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`
       );
     }
-    await super.beforeUpdate();
+    await super.beforeUpdate(args);
   }
 
   /**
    * Override `beforeDelete`.
    * - Prevents deletions if an associated OperationResult exists.
+   * @param {Object} args - Creation options.
+   * @param {Object} [args.transaction] - Firestore transaction.
+   * @param {Function} [args.callBack] - Callback function.
+   * @param {string} [args.prefix] - Path prefix.
    */
-  async beforeDelete() {
+  async beforeDelete(args = {}) {
     if (this._beforeData.operationResultId) {
       throw new Error(
         `Could not delete this document. The OperationResult based on this document already exists. OperationResultId: ${this._beforeData.operationResultId}`
       );
     }
-    await super.beforeDelete();
+    await super.beforeDelete(args);
   }
 
   /**
@@ -587,7 +595,13 @@ export default class SiteOperationSchedule extends Operation {
       // 加えて重複も除外する。
       const targetDates = dates
         .map((date) => {
-          if (date instanceof Date) return dayjs(date).format("YYYY-MM-DD");
+          if (date instanceof Date) {
+            const jstDate = new Date(date.getTime() + 9 * 60 * 60 * 1000);
+            const year = jstDate.getUTCFullYear();
+            const month = String(jstDate.getUTCMonth() + 1).padStart(2, "0");
+            const day = String(jstDate.getUTCDate()).padStart(2, "0");
+            return `${year}-${month}-${day}`;
+          }
           return date;
         })
         .filter((date) => date !== this.date)
@@ -602,6 +616,12 @@ export default class SiteOperationSchedule extends Operation {
         instance.docId = "";
         instance.dateAt = new Date(date);
         instance.operationResultId = null;
+
+        // 2025-12-23 追加
+        // 複製元が既に配置通知を出している可能性があるため、`hasNotification` を false に更新
+        instance.employees.forEach((emp) => (emp.hasNotification = false));
+        instance.outsourcers.forEach((out) => (out.hasNotification = false));
+
         return instance;
       });
 

package/src/System.js

@@ -0,0 +1,43 @@
+/**
+ * System.js
+ * @version 1.0.0
+ * @description System model
+ * @author shisyamo4131
+ */
+import FireModel from "@shisyamo4131/air-firebase-v2";
+import { defField } from "./parts/fieldDefinitions.js";
+
+const classProps = {
+  isMaintenance: defField("check", { default: false, hidden: true }),
+  updatedAt: defField("dateAt", { default: null, hidden: true }),
+  lastMaintenanceBy: defField("oneLine", {
+    default: "admin-sdk",
+    hidden: true,
+  }),
+};
+
+/**
+ * @prop {boolean} isMaintenance - maintenance mode flag
+ * @prop {Date} updatedAt - last updated timestamp
+ * @prop {string} lastMaintenanceBy - identifier of the last maintainer
+ */
+export default class System extends FireModel {
+  static className = "System";
+  static collectionPath = "System";
+  static usePrefix = false;
+  static useAutonumber = false;
+  static logicalDelete = false;
+  static classProps = classProps;
+
+  async create() {
+    return Promise.reject(new Error("[System.js] Not implemented."));
+  }
+
+  async update() {
+    return Promise.reject(new Error("[System.js] Not implemented."));
+  }
+
+  async delete() {
+    return Promise.reject(new Error("[System.js] Not implemented."));
+  }
+}

package/src/User.js

@@ -2,6 +2,7 @@
  * User Model
  * @version 1.1.0
  * @author shisyamo4131
+ * @update 2025-12-25 Added `tagSize` property.
  * @update 2025-11-24 Added `companyId`, `isAdmin`, `isTemporary` property.
  *                    Changed to prevent deletion of admin users.
  *
@@ -13,9 +14,11 @@
  * @prop {string} companyId - ID of the associated company.
  * @prop {boolean} isAdmin - Indicates if the user is an administrator.
  * @prop {boolean} isTemporary - Indicates if the user is temporary.
+ * @prop {string} tagSize - Size of the tag associated with the user.
  */
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
+import { TAG_SIZE_VALUES, TAG_SIZE_OPTIONS } from "./constants/index.js";
 
 const classProps = {
   email: defField("email", { required: true }),
@@ -37,6 +40,11 @@ const classProps = {
   companyId: defField("oneLine", { hidden: true, required: true }),
   isAdmin: defField("check", { hidden: true, default: false }),
   isTemporary: defField("check", { hidden: true, default: true }),
+  tagSize: defField("select", {
+    label: "タグサイズ",
+    default: TAG_SIZE_VALUES.MEDIUM.value,
+    options: TAG_SIZE_OPTIONS,
+  }),
 };
 
 export default class User extends FireModel {

package/src/apis/index.js

@@ -1,3 +1,7 @@
+// 2025-12-08
+// アプリ側で `useFetchXxxx` コンポーザブルを使用した API 連携を行う為
+// このファイルは不要。
+// 各種関数に依存しているファイルの存在がないことを確認の上、削除予定。
 export function fetchDocsApi(constructor) {
   const instance = new constructor();
   return async (search) => await instance.fetchDocs({ constraints: search });

package/src/constants/blood-type.js

@@ -0,0 +1,14 @@
+// prettier-ignore
+export const VALUES = Object.freeze({
+  A: { title: "A型", value: "A" },
+  B: { title: "B型", value: "B" },
+  O: { title: "O型", value: "O" },
+  AB: { title: "AB型", value: "AB" },
+});
+
+export const OPTIONS = [
+  { title: VALUES.A.title, value: VALUES.A.value },
+  { title: VALUES.B.title, value: VALUES.B.value },
+  { title: VALUES.O.title, value: VALUES.O.value },
+  { title: VALUES.AB.title, value: VALUES.AB.value },
+];

package/src/constants/certification-type.js

@@ -0,0 +1,34 @@
+/**
+ * @file src/constants/certification-type.js
+ * @description 警備業務資格の種別定義
+ *
+ * 警備業法に基づく4号区分：
+ * - 1号警備業務：施設警備業務
+ * - 2号警備業務：交通誘導警備業務、雑踏警備業務
+ * - 3号警備業務：貴重品運搬警備業務、核燃料物質等危険物運搬警備業務
+ * - 4号警備業務：身辺警備業務
+ *
+ * 実務上の考慮事項：
+ * - 現場ごとに必要な資格タイプが異なる
+ * - 1級保有者は2級の業務も対応可能（包括関係）
+ * - ユーザビリティを考慮し、タイプ単位で管理
+ */
+
+// prettier-ignore
+export const VALUES = Object.freeze({
+  FACILITY: { title: "施設警備", value: "FACILITY" },           // 1号
+  TRAFFIC: { title: "交通誘導警備", value: "TRAFFIC" },         // 2号
+  CROWD: { title: "雑踏警備", value: "CROWD" },                 // 2号
+  VALUABLES: { title: "貴重品運搬警備", value: "VALUABLES" },   // 3号
+  BODYGUARD: { title: "身辺警備", value: "BODYGUARD" },         // 4号
+  OTHER: { title: "その他", value: "OTHER" },
+});
+
+export const OPTIONS = [
+  { title: VALUES.FACILITY.title, value: VALUES.FACILITY.value },
+  { title: VALUES.TRAFFIC.title, value: VALUES.TRAFFIC.value },
+  { title: VALUES.CROWD.title, value: VALUES.CROWD.value },
+  { title: VALUES.VALUABLES.title, value: VALUES.VALUABLES.value },
+  { title: VALUES.BODYGUARD.title, value: VALUES.BODYGUARD.value },
+  { title: VALUES.OTHER.title, value: VALUES.OTHER.value },
+];

package/src/constants/emergency-contact-relation.js

@@ -0,0 +1,16 @@
+// prettier-ignore
+export const VALUES = Object.freeze({
+  PARENT: { title: "親", value: "PARENT" },
+  SPOUSE: { title: "配偶者", value: "SPOUSE" },
+  CHILD: { title: "子", value: "CHILD" },
+  SIBLING: { title: "兄弟姉妹", value: "SIBLING" },
+  OTHER: { title: "その他", value: "OTHER" },
+});
+
+export const OPTIONS = [
+  { title: VALUES.PARENT.title, value: VALUES.PARENT.value },
+  { title: VALUES.SPOUSE.title, value: VALUES.SPOUSE.value },
+  { title: VALUES.CHILD.title, value: VALUES.CHILD.value },
+  { title: VALUES.SIBLING.title, value: VALUES.SIBLING.value },
+  { title: VALUES.OTHER.title, value: VALUES.OTHER.value },
+];

package/src/constants/index.js

@@ -6,6 +6,14 @@ export {
   VALUES as BILLING_UNIT_TYPE_VALUES,
   OPTIONS as BILLING_UNIT_TYPE_OPTIONS,
 } from "./billing-unit-type.js";
+export {
+  VALUES as BLOOD_TYPE_VALUES,
+  OPTIONS as BLOOD_TYPE_OPTIONS,
+} from "./blood-type.js";
+export {
+  VALUES as CERTIFICATION_TYPE_VALUES,
+  OPTIONS as CERTIFICATION_TYPE_OPTIONS,
+} from "./certification-type.js";
 export {
   VALUES as CONTRACT_STATUS_VALUES,
   OPTIONS as CONTRACT_STATUS_OPTIONS,
@@ -15,6 +23,10 @@ export {
   OPTIONS as DAY_TYPE_OPTIONS,
   getDayType,
 } from "./day-type.js";
+export {
+  VALUES as EMERGENCY_CONTACT_RELATION_VALUES,
+  OPTIONS as EMERGENCY_CONTACT_RELATION_OPTIONS,
+} from "./emergency-contact-relation.js";
 export {
   VALUES as EMPLOYMENT_STATUS_VALUES,
   OPTIONS as EMPLOYMENT_STATUS_OPTIONS,
@@ -23,6 +35,10 @@ export {
   VALUES as GENDER_VALUES,
   OPTIONS as GENDER_OPTIONS,
 } from "./gender.js";
+export {
+  VALUES as PAYMENT_MONTH_VALUES,
+  OPTIONS as PAYMENT_MONTH_OPTIONS,
+} from "./payment-month.js";
 export {
   VALUES as PREFECTURES_VALUES,
   OPTIONS as PREFECTURES_OPTIONS,
@@ -36,3 +52,7 @@ export {
   VALUES as SITE_STATUS_VALUES,
   OPTIONS as SITE_STATUS_OPTIONS,
 } from "./site-status.js";
+export {
+  VALUES as TAG_SIZE_VALUES,
+  OPTIONS as TAG_SIZE_OPTIONS,
+} from "./tag-size.js";

package/src/constants/payment-month.js

@@ -0,0 +1,21 @@
+// prettier-ignore
+
+export const VALUES = Object.freeze({
+  0: { value: 0, title: "当月" },
+  1: { value: 1, title: "翌月" },
+  2: { value: 2, title: "翌々月" },
+  3: { value: 3, title: "3ヶ月後" },
+  4: { value: 4, title: "4ヶ月後" },
+  5: { value: 5, title: "5ヶ月後" },
+  6: { value: 6, title: "6ヶ月後" },
+});
+
+export const OPTIONS = [
+  { title: VALUES[0].title, value: VALUES[0].value },
+  { title: VALUES[1].title, value: VALUES[1].value },
+  { title: VALUES[2].title, value: VALUES[2].value },
+  { title: VALUES[3].title, value: VALUES[3].value },
+  { title: VALUES[4].title, value: VALUES[4].value },
+  { title: VALUES[5].title, value: VALUES[5].value },
+  { title: VALUES[6].title, value: VALUES[6].value },
+];

package/src/constants/tag-size.js

@@ -0,0 +1,16 @@
+/**
+ * @file src/constants/tag-size.js
+ * @description Tag size constants and options.
+ * @author shisyamo4131
+ */
+export const VALUES = Object.freeze({
+  SMALL: { value: "SMALL", title: "小" },
+  MEDIUM: { value: "MEDIUM", title: "中" },
+  LARGE: { value: "LARGE", title: "大" },
+});
+
+export const OPTIONS = [
+  { title: VALUES.SMALL.title, value: VALUES.SMALL.value },
+  { title: VALUES.MEDIUM.title, value: VALUES.MEDIUM.value },
+  { title: VALUES.LARGE.title, value: VALUES.LARGE.value },
+];

package/src/parts/accessorDefinitions.js

@@ -10,17 +10,15 @@ import { OPTIONS } from "../constants/prefectures.js";
  * @type {Object.<string, AccessorImplementation>}
  */
 const accessorImplementations = {
+  // 2025-12-08 削除可能
+  // `defAccessor("customerId")` で使用されていなければ削除。
   customerId: {
-    enumerable: true,
     get() {
       return this?.customer?.docId;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
   fullAddress: {
-    enumerable: true,
     get() {
       // 同じオブジェクトに 'prefecture' アクセサが定義されていることを前提とします
       const prefecture = this.prefecture || "";
@@ -28,53 +26,41 @@ const accessorImplementations = {
       const address = this.address || "";
       return `${prefecture}${city}${address}`;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
   fullName: {
-    enumerable: true,
     get() {
       if (!this.lastName || !this.firstName) return "";
       return `${this.lastName} ${this.firstName}`;
     },
-    set(value) {
-      // No-op setter for read-only access
+    set() {},
+  },
+  fullNameKana: {
+    get() {
+      if (!this.lastNameKana || !this.firstNameKana) return "";
+      return `${this.lastNameKana} ${this.firstNameKana}`;
     },
+    set() {},
   },
   prefecture: {
-    enumerable: true,
     get() {
-      // if (!this.hasOwnProperty("prefCode")) {
-      //   console.warn(
-      //     "[アクセサ: prefecture] このオブジェクトに prefCode が定義されていません。"
-      //   );
-      //   return "";
-      // }
-
       if (!this.prefCode) return ""; // No warning if prefCode is falsy but present
-
       const result = OPTIONS.find(({ value }) => value === this.prefCode);
-
       if (!result) {
         console.warn(
           `[アクセサ: prefecture] prefCode '${this.prefCode}' は OPTIONS に見つかりません。`
         );
         return "";
       }
-
       if (!result.hasOwnProperty("title")) {
         console.warn(
           `[アクセサ: prefecture] OPTIONS の prefCode '${this.prefCode}' に title が定義されていません。`
         );
         return "";
       }
-
       return result.title;
     },
-    set(value) {
-      // No-op setter for read-only access
-    },
+    set() {},
   },
 };
 
@@ -90,7 +76,7 @@ const accessorImplementations = {
  */
 export const defAccessor = (
   key,
-  { configurable = false, enumerable = false } = {}
+  { configurable = true, enumerable = true } = {}
 ) => {
   const implementation = accessorImplementations[key];
   if (!implementation) {