@shisyamo4131/air-guard-v2-schemas 1.3.1-dev.8 → 2.0.0

package/index.js

@@ -1,5 +1,6 @@
 export { default as Agreement } from "./src/Agreement.js";
 export { default as ArrangementNotification } from "./src/ArrangementNotification.js";
+export { default as Billing } from "./src/Billing.js";
 export { default as Company } from "./src/Company.js";
 export { default as Customer, CustomerMinimal } from "./src/Customer.js";
 export { default as CutoffDate } from "./src/utils/CutoffDate.js";

package/package.json

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

package/src/ArrangementNotification.js

@@ -139,7 +139,6 @@ import {
   VALUES,
   OPTIONS,
 } from "./constants/arrangement-notification-status.js";
-import { runTransaction } from "firebase/firestore";
 
 const classProps = {
   status: defField("arrangementNotificationStatus", { required: true }),
@@ -431,6 +430,14 @@ export default class ArrangementNotification extends SiteOperationScheduleDetail
       arguments: { id },
     };
     try {
+      // サーバー側での実行を禁止
+      if (this.type === "SERVER") {
+        throw new Error(
+          "fetchDocsBySiteOperationScheduleId is not supported on server side. " +
+            "Please use this method only on client side or implement server-specific logic with explicit prefix handling."
+        );
+      }
+
       const instance = new ArrangementNotification();
       const constraints = [["where", "siteOperationScheduleId", "==", id]];
       const result = await instance.fetchDocs({ constraints });
@@ -459,6 +466,14 @@ export default class ArrangementNotification extends SiteOperationScheduleDetail
       arguments: { ...options, transaction },
     };
     try {
+      // サーバー側での実行を禁止
+      if (this.type === "SERVER") {
+        throw new Error(
+          "bulkDelete is not supported on server side. " +
+            "Please use this method only on client side or implement server-specific logic with explicit prefix handling."
+        );
+      }
+
       const { siteOperationScheduleId, workerIds = [] } = options;
       if (!siteOperationScheduleId) {
         throw new Error("siteOperationScheduleId is required");
@@ -495,8 +510,7 @@ export default class ArrangementNotification extends SiteOperationScheduleDetail
       if (transaction) {
         await performTransaction(transaction);
       } else {
-        const firestore = this.getAdapter().firestore;
-        await runTransaction(firestore, performTransaction);
+        await this.runTransaction(performTransaction);
       }
     } catch (error) {
       throw new ContextualError(error.message, context);

package/src/Billing.js

@@ -6,9 +6,8 @@
  *
  * @prop {string} customerId - customer document id
  * @prop {string} siteId - site document id
- * @prop {string} billingMonth - billing month (YYYY-MM format)
- * @prop {Date} billingDate - billing date
- * @prop {Date} paymentDueDate - payment due date
+ * @prop {Date} billingDateAt - billing date
+ * @prop {Date} paymentDueDateAt - payment due date
  *
  * @prop {Array} paymentRecords - payment records (not implemented yet)
  *
@@ -17,10 +16,14 @@
  * @prop {Object} adjustment - adjustment
  * @prop {string} remarks - remarks
  *
+ * @prop {string} billingMonth - billing month (YYYY-MM format) (read-only)
+ * @prop {Date} billingDate - billing date (YYYY-MM-DD format) (read-only)
+ * @prop {string} paymentDueMonth - payment due month (YYYY-MM format) (read-only)
+ * @prop {Date} paymentDueDate - payment due date (YYYY-MM-DD format) (read-only)
  * @prop {number} subtotal - subtotal (excluding tax) (computed-readonly)
  * @prop {number} taxAmount - tax amount (computed-readonly)
  * @prop {number} totalAmount - total amount (including tax) (computed-readonly)
- * @prop {Array<Object>} itemsSummary - billing items summary for display (computed-readonly)
+ * @prop {Array<Object>} summary - summary for display (computed-readonly)
  *****************************************************************************/
 
 import FireModel from "@shisyamo4131/air-firebase-v2";
@@ -37,9 +40,8 @@ const STATUS = {
 const classProps = {
   customerId: defField("customerId", { required: true }),
   siteId: defField("siteId", { required: true }),
-  billingMonth: defField("oneLine", { required: true }),
-  billingDateAt: defField("date"),
-  paymentDueDateAt: defField("date"),
+  billingDateAt: defField("dateAt", { required: true }),
+  paymentDueDateAt: defField("dateAt"),
 
   // 入金管理用配列（現時点では未使用 将来の拡張用）
   paymentRecords: defField("array", { default: [] }), // Not implemented yet
@@ -66,6 +68,75 @@ export default class Billing extends FireModel {
   afterInitialize(item = {}) {
     super.afterInitialize(item);
 
+    // billingDate (YYYY-MM-DD) と billingMonth (YYYY-MM) の計算用プロパティを定義
+    Object.defineProperties(this, {
+      billingDate: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          if (!this.billingDateAt) return null;
+          const jstDate = new Date(
+            this.billingDateAt.getTime() + 9 * 60 * 60 * 1000
+          ); /* JST補正 */
+          const year = jstDate.getUTCFullYear();
+          const month = jstDate.getUTCMonth() + 1;
+          const day = jstDate.getUTCDate();
+          return `${year}-${String(month).padStart(2, "0")}-${String(
+            day
+          ).padStart(2, "0")}`;
+        },
+        set(v) {},
+      },
+      billingMonth: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          if (!this.billingDateAt) return null;
+          const jstDate = new Date(
+            this.billingDateAt.getTime() + 9 * 60 * 60 * 1000
+          ); /* JST補正 */
+          const year = jstDate.getUTCFullYear();
+          const month = jstDate.getUTCMonth() + 1;
+          return `${year}-${String(month).padStart(2, "0")}`;
+        },
+        set(v) {},
+      },
+    });
+
+    Object.defineProperties(this, {
+      paymentDueDate: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          if (!this.paymentDueDateAt) return null;
+          const jstDate = new Date(
+            this.paymentDueDateAt.getTime() + 9 * 60 * 60 * 1000
+          ); /* JST補正 */
+          const year = jstDate.getUTCFullYear();
+          const month = jstDate.getUTCMonth() + 1;
+          const day = jstDate.getUTCDate();
+          return `${year}-${String(month).padStart(2, "0")}-${String(
+            day
+          ).padStart(2, "0")}`;
+        },
+        set(v) {},
+      },
+      paymentDueMonth: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          if (!this.paymentDueDateAt) return null;
+          const jstDate = new Date(
+            this.paymentDueDateAt.getTime() + 9 * 60 * 60 * 1000
+          ); /* JST補正 */
+          const year = jstDate.getUTCFullYear();
+          const month = jstDate.getUTCMonth() + 1;
+          return `${year}-${String(month).padStart(2, "0")}`;
+        },
+        set(v) {},
+      },
+    });
+
     // 小計（税抜）を計算
     Object.defineProperty(this, "subtotal", {
       get() {
@@ -82,7 +153,9 @@ export default class Billing extends FireModel {
     // 消費税額を計算
     Object.defineProperty(this, "taxAmount", {
       get() {
-        return Math.floor(this.subtotal * 0.1); // 10% 切り捨て
+        return this.operationResults.reduce((sum, item) => {
+          return sum + (item.tax || 0);
+        }, 0);
       },
       set() {},
       enumerable: true,
@@ -100,7 +173,7 @@ export default class Billing extends FireModel {
     });
 
     // 表示用の明細サマリーを生成
-    Object.defineProperty(this, "itemsSummary", {
+    Object.defineProperty(this, "summary", {
       get() {
         return this.operationResults.map((item) => ({
           operationResultId: item.docId,

package/src/Customer.js

@@ -29,6 +29,10 @@
  * @static
  * @prop {string} STATUS_ACTIVE - constant for active contract status
  * @prop {string} STATUS_TERMINATED - constant for terminated contract status
+ *
+ * @method getPaymentDueDateAt
+ * @param {Date} baseDate - base date in UTC (JST - 9 hours)
+ * @returns {Date} payment due date in UTC (JST - 9 hours)
  *****************************************************************************/
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
@@ -99,6 +103,42 @@ export default class Customer extends FireModel {
       prefecture: defAccessor("prefecture"),
     });
   }
+
+  /**
+   * 支払期日を計算する
+   * @param {Date} baseDate - 基準日（JSTから9時間引いたUTC表現）
+   * @returns {Date} 支払期日（JSTから9時間引いたUTC表現）
+   */
+  getPaymentDueDateAt(baseDate) {
+    // UTC → JST に変換（+9時間）
+    const jstDate = new Date(baseDate.getTime() + 9 * 60 * 60 * 1000);
+
+    // UTCメソッドでJST相当の年月を取得
+    const year = jstDate.getUTCFullYear();
+    const month = jstDate.getUTCMonth();
+
+    // paymentMonth分加算した年月を計算
+    const targetMonth = month + this.paymentMonth;
+    const targetYear = year + Math.floor(targetMonth / 12);
+    const finalMonth = targetMonth % 12;
+
+    let dueDate;
+    if (this.paymentDate === CutoffDate.VALUES.END_OF_MONTH) {
+      // 月末の場合
+      dueDate = new Date(Date.UTC(targetYear, finalMonth + 1, 0));
+    } else {
+      // 指定日の場合
+      dueDate = new Date(Date.UTC(targetYear, finalMonth, this.paymentDate));
+
+      // 指定日が存在しない場合は月末にする
+      if (dueDate.getUTCMonth() !== finalMonth) {
+        dueDate = new Date(Date.UTC(targetYear, finalMonth + 1, 0));
+      }
+    }
+
+    // JST → UTC に変換（-9時間）
+    return new Date(dueDate.getTime() - 9 * 60 * 60 * 1000);
+  }
 }
 
 /*****************************************************************************

package/src/OperationBilling.js

@@ -41,7 +41,6 @@
  * - Setter: Splits array into employees and outsourcers based on `isEmployee` property
  * @prop {string|null} siteOperationScheduleId - Associated SiteOperationSchedule document ID
  * - If this OperationResult was created from a SiteOperationSchedule, this property holds that ID.
- * - If this property is set, the instance cannot be deleted.
  * @prop {boolean} useAdjustedQuantity - Flag to indicate if adjusted quantities are used for billing
  * @prop {number} adjustedQuantityBase - Adjusted quantity for base workers
  * - Quantity used for billing base workers when `useAdjustedQuantity` is true.
@@ -56,6 +55,10 @@
  * @prop {boolean} isLocked - Lock flag
  * - When set to true, the OperationResult is locked from edits exept for editing as OperationBilling.
  * @prop {Agreement|null} agreement - Associated Agreement object
+ * - The Agreement instance associated with this OperationResult for pricing and billing information.
+ * - When set, it influences billing calculations such as unit prices and billing dates.
+ * @prop {boolean} allowEmptyAgreement - Flag to ignore missing Agreement
+ * - When set to true, allows the OperationResult to be valid even if no Agreement is associated.
  *
  * @readonly
  * @prop {string} date - Date string in YYYY-MM-DD format based on `dateAt` (read-only)
@@ -76,9 +79,12 @@
  * @prop {number} overtimeWorkMinutes - Overtime work in minutes (read-only)
  * - Calculated as `totalWorkMinutes` minus `regulationWorkMinutes`
  * @prop {boolean} hasAgreement - Indicates if an Agreement is associated (read-only)
- * @prop {boolean} isValid - Indicates if the OperationResult is valid (read-only)
- * - Valid if either an Agreement is associated or adjusted quantities are not used.
- * - If `hasAgreement` is true, always valid.
+ * - `true` if `agreement` is set, otherwise `false`.
+ * @prop {string|false} isInvalid - Validation status (read-only)
+ * - Returns false if valid.
+ * - Returns reason code string if invalid:
+ *   - `EMPTY_BILLING_DATE`: Billing date is missing.
+ *   - `EMPTY_AGREEMENT`: Agreement is missing and `allowEmptyAgreement` is false.
  * @prop {Object} statistics - Statistics of workers (read-only)
  * - Contains counts and total work minutes for base and qualified workers, including OJT breakdowns.
  * - Structure: { base: {...}, qualified: {...}, total: {...} }
@@ -95,6 +101,8 @@
  * - Calculated using the `Tax` utility based on `salesAmount` and `date`.
  * @prop {number} billingAmount - Total billing amount including tax (read-only)
  * - Sum of `salesAmount` and `tax`.
+ * @prop {string|null} billingDate - Billing date in YYYY-MM-DD format (read-only)
+ * - Returns a string in the format YYYY-MM-DD based on `billingDateAt`.
  * @prop {string} billingMonth - Billing month in YYYY-MM format (read-only)
  * @prop {Array<string>} employeeIds - Array of employee IDs from `employees` (read-only)
  * @prop {Array<string>} outsourcerIds - Array of outsourcer IDs from `outsourcers` (read-only)
@@ -123,9 +131,6 @@
  * @getter {number} endMinute - End minute (0-59) (read-only)
  * - Extracted from `endTime`.
  *
- * @method beforeDelete - Override method to prevent deletion with siteOperationScheduleId
- * - Prevents deletion if the instance has `siteOperationScheduleId`.
- * - Throws an error if deletion is attempted on an instance created from SiteOperationSchedule.
  * @method refreshBillingDateAt - Refresh billingDateAt based on dateAt and cutoffDate
  * - Updates `billingDateAt` based on the current `dateAt` and `cutoffDate` values.
  * @method addWorker - Adds a new worker (employee or outsourcer)
@@ -163,12 +168,20 @@
  * - @param {Object|string} key - The combined key string or object
  * - @returns {Array<string>} - Array containing [siteId, shiftType, date]
  * - @throws {Error} - If the key is invalid.
+ * @method toggleLock - Toggle the lock status of an OperationResult document
+ * - @param {string} docId - Document ID
+ * - @param {boolean} value - Lock status value
+ * - @returns {Promise<void>}
  *
- * @override create - Override create method to indicate not implemented
+ * @override
+ * @method create - Override create method to indicate not implemented
  * - Creation of OperationBilling instances is not implemented, as billing records are typically
  *   generated through the OperationResult class.
+ * @method update - Override update method to allow editing even when isLocked is true
+ * @method delete - Override delete method to allow deletion even when isLocked is true
  *****************************************************************************/
 import OperationResult from "./OperationResult.js";
+import Operation from "./Operation.js";
 
 export default class OperationBilling extends OperationResult {
   static className = "稼働請求";
@@ -182,4 +195,45 @@ export default class OperationBilling extends OperationResult {
   async create() {
     return Promise.reject(new Error("[OperationBilling.js] Not implemented."));
   }
+
+  /**
+   * Override update method to allow editing even when isLocked is true
+   * @param {*} options
+   * @returns {Promise<void>}
+   */
+  async update(options = {}) {
+    // isLockedのチェックをスキップして、親クラス(Operation)のupdateを直接呼び出す
+    return await Operation.prototype.update.call(this, options);
+  }
+
+  /**
+   * Override delete method to allow deletion even when isLocked is true
+   * @param {*} options
+   * @returns {Promise<void>}
+   */
+  async delete(options = {}) {
+    // isLockedのチェックをスキップして、親クラス(Operation)のdeleteを直接呼び出す
+    return await Operation.prototype.delete.call(this, options);
+  }
+
+  /**
+   * Toggle the lock status of an OperationResult document
+   * @param {string} docId - Document ID
+   * @param {boolean} value - Lock status value
+   */
+  static async toggleLock(docId, value) {
+    if (!docId || typeof docId !== "string") {
+      throw new Error("Invalid docId provided to toggleLock method");
+    }
+    if (typeof value !== "boolean") {
+      throw new Error("Invalid value provided to toggleLock method");
+    }
+    const instance = new OperationBilling();
+    const doc = await instance.fetchDoc({ docId });
+    if (!doc) {
+      throw new Error(`OperationResult document with ID ${docId} not found`);
+    }
+    doc.isLocked = value;
+    await doc.update();
+  }
 }

package/src/OperationResult.js

@@ -5,7 +5,6 @@
  *
  * - Extends Operation class to represent the result of an operation.
  * - Also incorporates Agreement class properties for pricing and billing information.
- * - Prevents deletion if the instance has `siteOperationScheduleId`.
  * - Provides comprehensive billing calculations including statistics, sales amounts, and tax.
  * - Supports both daily and hourly billing with adjusted quantities.
  * - Automatically updates `billingDateAt` based on `dateAt` and `cutoffDate`.
@@ -41,7 +40,6 @@
  * - Setter: Splits array into employees and outsourcers based on `isEmployee` property
  * @prop {string|null} siteOperationScheduleId - Associated SiteOperationSchedule document ID
  * - If this OperationResult was created from a SiteOperationSchedule, this property holds that ID.
- * - If this property is set, the instance cannot be deleted.
  * @prop {boolean} useAdjustedQuantity - Flag to indicate if adjusted quantities are used for billing
  * @prop {number} adjustedQuantityBase - Adjusted quantity for base workers
  * - Quantity used for billing base workers when `useAdjustedQuantity` is true.
@@ -56,7 +54,10 @@
  * @prop {boolean} isLocked - Lock flag
  * - When set to true, the OperationResult is locked from edits exept for editing as OperationBilling.
  * @prop {Agreement|null} agreement - Associated Agreement object
- *
+ * - The Agreement instance associated with this OperationResult for pricing and billing information.
+ * - When set, it influences billing calculations such as unit prices and billing dates.
+ * @prop {boolean} allowEmptyAgreement - Flag to ignore missing Agreement
+ * - When set to true, allows the OperationResult to be valid even if no Agreement is associated.
  * @readonly
  * @prop {string} date - Date string in YYYY-MM-DD format based on `dateAt` (read-only)
  * - Returns a string in the format YYYY-MM-DD based on `dateAt`.
@@ -76,9 +77,12 @@
  * @prop {number} overtimeWorkMinutes - Overtime work in minutes (read-only)
  * - Calculated as `totalWorkMinutes` minus `regulationWorkMinutes`
  * @prop {boolean} hasAgreement - Indicates if an Agreement is associated (read-only)
- * @prop {boolean} isValid - Indicates if the OperationResult is valid (read-only)
- * - Valid if either an Agreement is associated or adjusted quantities are not used.
- * - If `hasAgreement` is true, always valid.
+ * - `true` if `agreement` is set, otherwise `false`.
+ * @prop {string|false} isInvalid - Validation status (read-only)
+ * - Returns false if valid.
+ * - Returns reason code string if invalid:
+ *   - `EMPTY_BILLING_DATE`: Billing date is missing.
+ *   - `EMPTY_AGREEMENT`: Agreement is missing and `allowEmptyAgreement` is false.
  * @prop {Object} statistics - Statistics of workers (read-only)
  * - Contains counts and total work minutes for base and qualified workers, including OJT breakdowns.
  * - Structure: { base: {...}, qualified: {...}, total: {...} }
@@ -95,6 +99,8 @@
  * - Calculated using the `Tax` utility based on `salesAmount` and `date`.
  * @prop {number} billingAmount - Total billing amount including tax (read-only)
  * - Sum of `salesAmount` and `tax`.
+ * @prop {string|null} billingDate - Billing date in YYYY-MM-DD format (read-only)
+ * - Returns a string in the format YYYY-MM-DD based on `billingDateAt`.
  * @prop {string} billingMonth - Billing month in YYYY-MM format (read-only)
  * @prop {Array<string>} employeeIds - Array of employee IDs from `employees` (read-only)
  * @prop {Array<string>} outsourcerIds - Array of outsourcer IDs from `outsourcers` (read-only)
@@ -123,9 +129,6 @@
  * @getter {number} endMinute - End minute (0-59) (read-only)
  * - Extracted from `endTime`.
  *
- * @method beforeDelete - Override method to prevent deletion with siteOperationScheduleId
- * - Prevents deletion if the instance has `siteOperationScheduleId`.
- * - Throws an error if deletion is attempted on an instance created from SiteOperationSchedule.
  * @method refreshBillingDateAt - Refresh billingDateAt based on dateAt and cutoffDate
  * - Updates `billingDateAt` based on the current `dateAt` and `cutoffDate` values.
  * @method addWorker - Adds a new worker (employee or outsourcer)
@@ -164,7 +167,11 @@
  * - @returns {Array<string>} - Array containing [siteId, shiftType, date]
  * - @throws {Error} - If the key is invalid.
  *
- * @override setDateAtCallback - Updates `billingDateAt` based on the new `dateAt` value.
+ * @override
+ * @method setDateAtCallback - Updates `billingDateAt` based on the new `dateAt` value.
+ * @method beforeCreate - Override to sync customerId from siteId
+ * @method beforeUpdate - Override to sync customerId from siteId when siteId changes
+ * @method beforeDelete - Override to prevent deletion if isLocked is true
  *****************************************************************************/
 import Operation from "./Operation.js";
 import Agreement from "./Agreement.js";
@@ -175,6 +182,7 @@ import Tax from "./tax.js";
 import { BILLING_UNIT_TYPE_PER_HOUR } from "./constants/billing-unit-type.js";
 import RoundSetting from "./RoundSetting.js";
 import CutoffDate from "./utils/CutoffDate.js";
+import Site from "./Site.js";
 
 const classProps = {
   ...Operation.classProps,
@@ -199,7 +207,7 @@ const classProps = {
     label: "資格残業（調整）",
     default: 0,
   }),
-  billingDateAt: defField("dateAt", { label: "請求日付" }),
+  billingDateAt: defField("dateAt", { label: "請求締日" }),
   employees: defField("array", { customClass: OperationResultDetail }),
   outsourcers: defField("array", {
     customClass: OperationResultDetail,
@@ -209,10 +217,22 @@ const classProps = {
     default: false,
   }),
   agreement: defField("object", { label: "取極め", customClass: Agreement }),
-  ignoreEmptyAgreement: defField("check", {
-    label: "取極めなしを無視",
+  allowEmptyAgreement: defField("check", {
+    label: "取極めなしを許容",
     default: false,
   }),
+
+  /**
+   * siteId から自動同期されるプロパティ
+   * - 従属する取引先の変更を不可としているため、ドキュメントの更新時に取得するだけで問題ない。
+   * - 但し、siteId が変更された時は再取得する必要がある。
+   */
+  customerId: defField("customerId", { required: true, hidden: true }),
+};
+
+const INVALID_REASON = {
+  EMPTY_BILLING_DATE: "EMPTY_BILLING_DATE",
+  EMPTY_AGREEMENT: "EMPTY_AGREEMENT",
 };
 
 export default class OperationResult extends Operation {
@@ -234,7 +254,6 @@ export default class OperationResult extends Operation {
     super.afterInitialize();
 
     /** Computed properties */
-    let _agreement = this.agreement;
     Object.defineProperties(this, {
       statistics: {
         configurable: true,
@@ -405,7 +424,7 @@ export default class OperationResult extends Operation {
         },
         set(v) {},
       },
-      billingMonth: {
+      billingDate: {
         configurable: true,
         enumerable: true,
         get() {
@@ -415,21 +434,26 @@ export default class OperationResult extends Operation {
           ); /* JST補正 */
           const year = jstDate.getUTCFullYear();
           const month = jstDate.getUTCMonth() + 1;
-          return `${year}-${String(month).padStart(2, "0")}`;
+          const day = jstDate.getUTCDate();
+          return `${year}-${String(month).padStart(2, "0")}-${String(
+            day
+          ).padStart(2, "0")}`;
         },
         set(v) {},
       },
-
-      agreement: {
+      billingMonth: {
         configurable: true,
         enumerable: true,
         get() {
-          return _agreement;
-        },
-        set(v) {
-          _agreement = v;
-          this.refreshBillingDateAt();
+          if (!this.billingDateAt) return null;
+          const jstDate = new Date(
+            this.billingDateAt.getTime() + 9 * 60 * 60 * 1000
+          ); /* JST補正 */
+          const year = jstDate.getUTCFullYear();
+          const month = jstDate.getUTCMonth() + 1;
+          return `${year}-${String(month).padStart(2, "0")}`;
         },
+        set(v) {},
       },
       hasAgreement: {
         configurable: true,
@@ -439,16 +463,40 @@ export default class OperationResult extends Operation {
         },
         set(v) {},
       },
-      isValid: {
+      isInvalid: {
         configurable: true,
         enumerable: true,
         get() {
-          if (this.hasAgreement) return true;
-          return this.ignoreEmptyAgreement;
+          if (!this.agreement && !this.allowEmptyAgreement) {
+            return INVALID_REASON.EMPTY_AGREEMENT;
+          }
+          if (!this.billingDateAt) {
+            return INVALID_REASON.EMPTY_BILLING_DATE;
+          }
+          return false;
         },
         set(v) {},
       },
     });
+
+    /** Triggers */
+    let _agreement = this.agreement;
+    Object.defineProperties(this, {
+      agreement: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return _agreement;
+        },
+        set(v) {
+          const oldKey = _agreement ? _agreement.key : null;
+          const newKey = v ? v.key : null;
+          if (oldKey === newKey) return;
+          _agreement = v;
+          this.refreshBillingDateAt();
+        },
+      },
+    });
   }
 
   /**
@@ -484,50 +532,65 @@ export default class OperationResult extends Operation {
   }
 
   /**
-   * Override create method to validate billingDateAt when ignoreEmptyAgreement is true
-   * @param {*} options
-   * @returns {Promise<DocumentReference>}
+   * Synchronize customerId from siteId
+   * @returns {Promise<void>}
+   * @throws {Error} If the specified siteId does not exist
    */
-  async create(options = {}) {
-    if (this.ignoreEmptyAgreement && !this.billingDateAt) {
+  async _syncCustomerId() {
+    if (!this.siteId) return;
+    const siteInstance = new Site();
+    const siteExists = await siteInstance.fetch({ docId: this.siteId });
+    if (!siteExists) {
       throw new Error(
-        "[OperationResult] Billing date is required when 'ignoreEmptyAgreement' is true."
+        `[OperationResult] The specified siteId (${this.siteId}) does not exist.`
       );
     }
-    return await super.create(options);
+    this.customerId = siteInstance.customerId;
+  }
+
+  /**
+   * Override beforeCreate to sync customerId
+   * @returns {Promise<void>}
+   */
+  async beforeCreate() {
+    await super.beforeCreate();
+
+    // Sync customerId
+    await this._syncCustomerId();
   }
 
   /**
-   * Override update method to prevent editing if isLocked is true
-   * - Also validate billingDateAt when ignoreEmptyAgreement is true
-   * @param {*} options
+   * Override beforeUpdate to sync customerId if siteId changed
    * @returns {Promise<void>}
    */
-  async update(options = {}) {
+  async beforeUpdate() {
+    await super.beforeUpdate();
+
+    // Prevent editing if isLocked is true
     if (this.isLocked) {
       throw new Error(
         "[OperationResult] This OperationResult is locked and cannot be edited."
       );
     }
-    if (this.ignoreEmptyAgreement && !this.billingDateAt) {
-      throw new Error(
-        "[OperationResult] Billing date is required when 'ignoreEmptyAgreement' is true."
-      );
-    }
-    return await super.update(options);
+
+    // Sync customerId if siteId changed
+    if (this.siteId === this._beforeData.siteId && this.customerId) return;
+    await this._syncCustomerId();
   }
 
   /**
-   * Override delete method to prevent deletion if isLocked is true
-   * @param {*} options
+   * Override beforeDelete to prevent deletion if isLocked is true
    * @returns {Promise<void>}
+   * @throws {Error} If isLocked is true
    */
-  async delete(options = {}) {
+  async beforeDelete() {
+    await super.beforeDelete();
+
+    // Prevent deletion if isLocked is true
     if (this.isLocked) {
       throw new Error(
         "[OperationResult] This OperationResult is locked and cannot be deleted."
       );
     }
-    return await super.delete(options);
   }
 }

package/src/Site.js

@@ -1,7 +1,10 @@
 /**
  * @file src/Site.js
  * @author shisyamo4131
- * @version 1.0.0
+ * @version 1.1.0
+ * @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.
  */
 import { default as FireModel } from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
@@ -12,6 +15,16 @@ 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,
+      },
+    },
+  }),
   code: defField("code", { label: "現場コード" }),
   name: defField("name", {
     label: "現場名",
@@ -29,16 +42,6 @@ const classProps = {
   address: defField("address", { required: true }),
   building: defField("building"),
   location: defField("location"),
-  customer: defField("customer", {
-    required: true,
-    customClass: CustomerMinimal,
-    component: {
-      attrs: {
-        api: () => fetchDocsApi(CustomerMinimal),
-        noFilter: true,
-      },
-    },
-  }),
   remarks: defField("multipleLine", { label: "備考" }),
   agreements: defField("array", { label: "取極め", customClass: Agreement }),
   status: defField("siteStatus", { required: true }),
@@ -115,6 +118,19 @@ export default class Site extends FireModel {
   static STATUS_ACTIVE = VALUES.ACTIVE.value;
   static STATUS_TERMINATED = VALUES.TERMINATED.value;
 
+  /**
+   * Override beforeUpdate to prevent changing customer reference.
+   * @returns {Promise<void>}
+   */
+  async beforeUpdate() {
+    await super.beforeUpdate();
+    if (this.customer.docId !== this._beforeData.customer.docId) {
+      return Promise.reject(
+        new Error("Not allowed to change customer reference.")
+      );
+    }
+  }
+
   afterInitialize(item = {}) {
     super.afterInitialize(item);
 

package/src/parts/fieldDefinitions.js

@@ -210,6 +210,18 @@ export const fieldDefinitions = {
     label: "市区町村",
     length: 10,
   },
+  customerId: {
+    ...generalDefinitions.oneLine,
+    label: "取引先",
+    component: {
+      name: "air-autocomplete-api",
+      attrs: {
+        itemValue: "docId",
+        itemTitle: "name",
+        noFilter: true,
+      },
+    },
+  },
   displayName: {
     ...generalDefinitions.oneLine,
     label: "表示名",