@shisyamo4131/air-guard-v2-schemas 2.3.7-dev.29 → 2.3.7-dev.30

package/package.json

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

package/src/Employee.js

@@ -414,9 +414,15 @@ export default class Employee extends FireModel {
    * 新しい従業員ドキュメントが作成される前に実行されるフック。
    * - 親クラスの `beforeCreate` を呼び出します。
    * - 従業員が外国人の場合、外国人名と国籍が未入力であればエラーをスローします。
+   * @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.
    */
-  async beforeCreate() {
-    await super.beforeCreate();
+  async beforeCreate(args = {}) {
+    await super.beforeCreate(args);
     this._validateForeignerRequiredFields();
     this._validateTerminatedRequiredFields();
     this._validateSecurityGuardFields();
@@ -426,9 +432,13 @@ export default class Employee extends FireModel {
    * 従業員ドキュメントが更新される前に実行されるフック。
    * - 親クラスの `beforeUpdate` を呼び出します。
    * - 従業員が外国人の場合、外国人名と国籍が未入力であればエラーをスローします。
+   * @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() {
-    await super.beforeUpdate();
+  async beforeUpdate(args = {}) {
+    await super.beforeUpdate(args);
 
     // `employmentStatus` の `terminated` への直接変更の禁止
     // - 従業員を退職させる場合、様々なチェックが必要になることが想定されるため、専用メソッドとして `toTerminated` を使用する。

package/src/OperationBilling.js

@@ -193,12 +193,17 @@ export default class OperationBilling extends OperationResult {
 
   /**
    * Override beforeUpdate to skip `isLocked` check and 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() {
+  async beforeUpdate(args = {}) {
+    await super.beforeUpdate(args);
     // Sync customerId and apply agreement if key changed
     if (this.key === this._beforeData.key) return;
-    await this._syncCustomerIdAndApplyAgreement();
+    await this._syncCustomerIdAndApplyAgreement(args);
   }
 
   /**

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,35 @@
  * @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 { CustomerMinimal } from "./Customer.js";
+// import { fetchDocsApi } from "./apis/index.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 }),
+  // customer: defField("customer", {
+  //   required: true,
+  //   customClass: CustomerMinimal,
+  //   component: {
+  //     attrs: {
+  //       api: () => fetchDocsApi(CustomerMinimal),
+  //       noFilter: true,
+  //     },
+  //   },
+  // }),
   code: defField("code", { label: "現場コード" }),
   name: defField("name", {
     label: "現場名",
@@ -118,12 +127,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 +174,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);
   }
 
   /**

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/parts/accessorDefinitions.js

@@ -10,6 +10,8 @@ import { OPTIONS } from "../constants/prefectures.js";
  * @type {Object.<string, AccessorImplementation>}
  */
 const accessorImplementations = {
+  // 2025-12-08 削除可能
+  // `defAccessor("customerId")` で使用されていなければ削除。
   customerId: {
     get() {
       return this?.customer?.docId;

package/src/parts/fieldDefinitions.js

@@ -246,6 +246,8 @@ export const fieldDefinitions = {
   customerId: {
     ...generalDefinitions.oneLine,
     label: "取引先",
+    // アプリ側で `useFetchXxxx` コンポーザブルを使用するため
+    // 使用するクラス側で api 関連の設定は不要。
     component: {
       name: "air-autocomplete-api",
       attrs: {