@shisyamo4131/air-guard-v2-schemas 1.3.1-dev.7 → 1.3.1-dev.9

package/package.json

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

package/src/OperationBilling.js

@@ -56,6 +56,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)

package/src/OperationResult.js

@@ -56,7 +56,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`.
@@ -209,7 +212,7 @@ const classProps = {
     default: false,
   }),
   agreement: defField("object", { label: "取極め", customClass: Agreement }),
-  ignoreEmptyAgreement: defField("check", {
+  allowEmptyAgreement: defField("check", {
     label: "取極めなしを無視",
     default: false,
   }),
@@ -234,6 +237,7 @@ export default class OperationResult extends Operation {
     super.afterInitialize();
 
     /** Computed properties */
+    let _agreement = this.agreement;
     Object.defineProperties(this, {
       statistics: {
         configurable: true,
@@ -419,7 +423,17 @@ export default class OperationResult extends Operation {
         set(v) {},
       },
 
-      /** add */
+      agreement: {
+        configurable: true,
+        enumerable: true,
+        get() {
+          return _agreement;
+        },
+        set(v) {
+          _agreement = v;
+          this.refreshBillingDateAt();
+        },
+      },
       hasAgreement: {
         configurable: true,
         enumerable: true,
@@ -433,7 +447,7 @@ export default class OperationResult extends Operation {
         enumerable: true,
         get() {
           if (this.hasAgreement) return true;
-          return this.ignoreEmptyAgreement;
+          return this.allowEmptyAgreement;
         },
         set(v) {},
       },
@@ -472,8 +486,23 @@ export default class OperationResult extends Operation {
     this.refreshBillingDateAt();
   }
 
+  /**
+   * Override create method to validate billingDateAt when allowEmptyAgreement is true
+   * @param {*} options
+   * @returns {Promise<DocumentReference>}
+   */
+  async create(options = {}) {
+    if (this.allowEmptyAgreement && !this.billingDateAt) {
+      throw new Error(
+        "[OperationResult] Billing date is required when 'allowEmptyAgreement' is true."
+      );
+    }
+    return await super.create(options);
+  }
+
   /**
    * Override update method to prevent editing if isLocked is true
+   * - Also validate billingDateAt when allowEmptyAgreement is true
    * @param {*} options
    * @returns {Promise<void>}
    */
@@ -483,7 +512,12 @@ export default class OperationResult extends Operation {
         "[OperationResult] This OperationResult is locked and cannot be edited."
       );
     }
-    return super.update(options);
+    if (this.allowEmptyAgreement && !this.billingDateAt) {
+      throw new Error(
+        "[OperationResult] Billing date is required when 'allowEmptyAgreement' is true."
+      );
+    }
+    return await super.update(options);
   }
 
   /**
@@ -497,6 +531,6 @@ export default class OperationResult extends Operation {
         "[OperationResult] This OperationResult is locked and cannot be deleted."
       );
     }
-    return super.delete(options);
+    return await super.delete(options);
   }
 }