@shisyamo4131/air-guard-v2-schemas 1.2.0 → 1.3.0

package/package.json

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

package/src/Agreement.js

@@ -234,6 +234,34 @@ export default class Agreement extends WorkingResult {
   static classProps = classProps;
   static headers = headers;
 
+  /**
+   * Returns an object containing price-related properties.
+   * This accessor is useful for synchronizing price details when creating `OperationResult` instance
+   * from a `SiteOperationSchedule`.
+   * - Includes `regulationWorkMinutes`.
+   * @returns {Object} An object with price-related properties.
+   * @property {number} cutoffDate - Cutoff date
+   * @property {number} regulationWorkMinutes - Regulation work minutes
+   * @property {number} unitPriceBase - Base unit price
+   * @property {number} overtimeUnitPriceBase - Overtime base unit price
+   * @property {number} unitPriceQualified - Qualified unit price
+   * @property {number} overtimeUnitPriceQualified - Overtime qualified unit price
+   * @property {string} billingUnitType - Billing unit type
+   * @property {boolean} includeBreakInBilling - Whether to include break time in billing
+   */
+  get billingInfo() {
+    return {
+      cutoffDate: this.cutoffDate,
+      regulationWorkMinutes: this.regulationWorkMinutes,
+      unitPriceBase: this.unitPriceBase,
+      overtimeUnitPriceBase: this.overtimeUnitPriceBase,
+      unitPriceQualified: this.unitPriceQualified,
+      overtimeUnitPriceQualified: this.overtimeUnitPriceQualified,
+      billingUnitType: this.billingUnitType,
+      includeBreakInBilling: this.includeBreakInBilling,
+    };
+  }
+
   /**
    * Returns an object containing price-related properties.
    * This accessor is useful for synchronizing price details when creating `OperationResult` instance
@@ -249,6 +277,9 @@ export default class Agreement extends WorkingResult {
    * @property {boolean} includeBreakInBilling - Whether to include break time in billing
    */
   get prices() {
+    console.warn(
+      "`Agreement.prices` is deprecated. Use `Agreement.billingInfo` instead."
+    );
     return {
       regulationWorkMinutes: this.regulationWorkMinutes,
       unitPriceBase: this.unitPriceBase,

package/src/OperationResult.js

@@ -246,12 +246,7 @@ export default class OperationResult extends Operation {
         set(v) {
           _cutoffDate = v;
           // Update billingDateAt when cutoffDate changes
-          if (this.dateAt) {
-            this.billingDateAt = CutoffDate.getBillingDateAt(
-              this.dateAt,
-              this.cutoffDate
-            );
-          }
+          this.refreshBillingDateAt();
         },
       },
       statistics: {
@@ -429,10 +424,24 @@ export default class OperationResult extends Operation {
     });
   }
 
+  refreshBillingDateAt() {
+    if (!this.dateAt) {
+      this.billingDateAt = null;
+      return;
+    }
+    if (this.cutoffDate !== 0 && !this.cutoffDate) {
+      this.billingDateAt = null;
+      return;
+    }
+    this.billingDateAt = CutoffDate.calculateBillingDateAt(
+      this.dateAt,
+      this.cutoffDate
+    );
+  }
+
   setDateAtCallback(v) {
     super.setDateAtCallback(v);
-    if (!this.cutoffDate) return;
-    this.billingDateAt = CutoffDate.getBillingDateAt(v, this.cutoffDate);
+    this.refreshBillingDateAt();
   }
 
   /**

package/src/utils/CutoffDate.js

@@ -11,8 +11,8 @@
  * @static {Array} OPTIONS - Options for selection components
  * @static {function} calculateActualCutoffDay - Calculate actual cutoff day for given year/month
  * @static {function} calculateBillingPeriod - Calculate billing period for given date and cutoff
- * @static {function} calculateCutoffDate - Calculate cutoff date as Date object for given sales date
- * @static {function} calculateCutoffDateString - Calculate cutoff date as string (YYYY-MM-DD) for given sales date
+ * @static {function} calculateBillingDateAt - Calculate cutoff date as Date object for given sales date
+ * @static {function} calculateBillingDateAtString - Calculate cutoff date as string (YYYY-MM-DD) for given sales date
  * @static {function} getDisplayText - Get display text for cutoff date value
  * @static {function} isValidCutoffDate - Validate cutoff date value
  *****************************************************************************/
@@ -179,14 +179,14 @@ export default class CutoffDate {
    * @example
    * // For JST 2024-03-15 with 10th cutoff
    * // Input: UTC date representing JST 2024-03-15
-   * const cutoffDate = CutoffDate.calculateCutoffDate(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDate = CutoffDate.calculateBillingDateAt(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns: UTC date representing JST 2024-04-10
    *
    * // For JST 2024-03-05 with 10th cutoff
-   * const cutoffDate = CutoffDate.calculateCutoffDate(new Date('2024-03-04T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDate = CutoffDate.calculateBillingDateAt(new Date('2024-03-04T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns: UTC date representing JST 2024-03-10
    */
-  static calculateCutoffDate(salesDate, cutoffDateValue) {
+  static calculateBillingDateAt(salesDate, cutoffDateValue) {
     // Convert UTC to JST by adding 9 hours to get the JST date
     const jstDate = new Date(salesDate.getTime() + 9 * 60 * 60 * 1000);
     const year = jstDate.getUTCFullYear();
@@ -230,11 +230,11 @@ export default class CutoffDate {
    * @returns {string} Cutoff date in YYYY-MM-DD format (JST)
    * @example
    * // For JST 2024-03-15 with 10th cutoff
-   * const cutoffDateString = CutoffDate.calculateCutoffDateString(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
+   * const cutoffDateString = CutoffDate.calculateBillingDateAtString(new Date('2024-03-14T15:00:00Z'), CutoffDate.VALUES.DAY_10);
    * // Returns "2024-04-10"
    */
-  static calculateCutoffDateString(salesDate, cutoffDateValue) {
-    const cutoffDate = CutoffDate.calculateCutoffDate(
+  static calculateBillingDateAtString(salesDate, cutoffDateValue) {
+    const cutoffDate = CutoffDate.calculateBillingDateAt(
       salesDate,
       cutoffDateValue
     );