@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.3 → 2.3.7-dev.31

package/src/OperationResult.js

@@ -541,39 +541,56 @@ export default class OperationResult extends Operation {
   }
 
   /**
-   * Synchronize customerId from siteId
+   * 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 _syncCustomerId() {
+  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.`
       );
     }
     this.customerId = siteInstance.customerId;
+    this.agreement = siteInstance.getAgreement(this);
   }
 
   /**
    * 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
-    await this._syncCustomerId();
+    // Sync customerId and apply agreement
+    await this._syncCustomerIdAndApplyAgreement();
   }
 
   /**
-   * Override beforeUpdate to sync customerId if siteId changed
+   * 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) {
@@ -582,19 +599,22 @@ export default class OperationResult extends Operation {
       );
     }
 
-    // Sync customerId if siteId changed
-    if (this.siteId === this._beforeData.siteId && this.customerId) return;
-    await this._syncCustomerId();
+    // Sync customerId and apply agreement if key changed
+    if (this.key === this._beforeData.key) return;
+    await this._syncCustomerIdAndApplyAgreement();
   }
 
   /**
    * 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,23 @@
  * @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", {
-    required: true,
-    customClass: CustomerMinimal,
-    component: {
-      attrs: {
-        api: () => fetchDocsApi(CustomerMinimal),
-        noFilter: true,
-      },
-    },
-  }),
+  customerId: defField("customerId", { required: true }),
+  customer: defField("customer", { hidden: true, customClass: Customer }),
   code: defField("code", { label: "現場コード" }),
   name: defField("name", {
     label: "現場名",
@@ -118,12 +115,42 @@ export default class Site extends FireModel {
   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 +162,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

@@ -1,8 +1,9 @@
 /*****************************************************************************
  * SiteOperationSchedule Model ver 1.1.0
- * @version 1.1.0
+ * @version 1.1.1
  * @author shisyamo4131
  *
+ * @update 2025-11-28 v1.1.1 - Removed the `agreement` parameter from `syncToOperationResult` method.
  * @update 2025-11-22 v1.1.0 - Moved `duplicate`, `notify`, `syncToOperationResult`,
  *                             and `toEvent` methods from client side code.
  *
@@ -167,7 +168,8 @@
  * @method syncToOperationResult - Creates an OperationResult document based on the current SiteOperationSchedule
  * - The OperationResult document ID will be the same as the SiteOperationSchedule document ID.
  * - Sets the `operationResultId` property of the SiteOperationSchedule to the created OperationResult document ID.
- * - Accepts an `agreement` object containing necessary properties for creating the OperationResult.
+ * - If an OperationResult already exists, it will be overwritten.
+ * - [UPDATE 2025-11-28] Removed the `agreement` parameter. The agreement is now fetched internally.
  *
  * @method toEvent - Converts the SiteOperationSchedule instance to a VCalendar event object
  * - Returns an object with properties required for displaying events in Vuetify's VCalendar component.
@@ -383,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);
   }
 
   /**
@@ -679,9 +689,14 @@ export default class SiteOperationSchedule extends Operation {
    *   既に存在する場合は上書きされます。
    * - 現場稼働予定ドキュメントの `operationResultId` プロパティに
    *   作成された稼働実績ドキュメントの ID が設定されます。（当該ドキュメント ID と同一）
-   * @param {Object} agreement - 取極め情報オブジェクト。稼働実績ドキュメントの生成に必要なプロパティを含みます。
+   * @param {Object} notifications - 配置通知オブジェクトのマップ。
+   *   - キー: 配置通知の一意キー（`notificationKey` プロパティ）
+   *   - 値: 配置通知ドキュメントオブジェクト
+   * @returns {Promise<void>}
+   *
+   * @update 2025-11-28 - Removed the `agreement` parameter.
    */
-  async syncToOperationResult(agreement, notifications = {}) {
+  async syncToOperationResult(notifications = {}) {
     if (!this.docId) {
       throw new Error(
         "不正な処理です。作成前の現場稼働予定から稼働実績を作成することはできません。"
@@ -695,18 +710,12 @@ export default class SiteOperationSchedule extends Operation {
       return this[prop].map((w) => {
         const notification = notifications[w.notificationKey];
         if (!notification) return w;
-        const {
-          actualStartTime: startTime,
-          actualEndTime: endTime,
-          actualBreakMinutes: breakMinutes,
-          actualIsStartNextDay: isStartNextDay,
-        } = notification;
         return new SiteOperationScheduleDetail({
           ...w.toObject(),
-          startTime,
-          endTime,
-          breakMinutes,
-          isStartNextDay,
+          startTime: notification.actualStartTime,
+          endTime: notification.actualEndTime,
+          breakMinutes: notification.actualBreakMinutes,
+          isStartNextDay: notification.actualIsStartNextDay,
         });
       });
     };
@@ -718,10 +727,8 @@ export default class SiteOperationSchedule extends Operation {
         ...this.toObject(),
         employees,
         outsourcers,
-        agreement: agreement || null,
         siteOperationScheduleId: this.docId,
       });
-      operationResult.refreshBillingDateAt();
       await this.constructor.runTransaction(async (transaction) => {
         const docRef = await operationResult.create({
           docId: this.docId,

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/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/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,10 @@ 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 CONTRACT_STATUS_VALUES,
   OPTIONS as CONTRACT_STATUS_OPTIONS,
@@ -15,6 +19,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,

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) {