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

package/package.json

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

package/src/OperationResult.js

@@ -541,11 +541,11 @@ export default class OperationResult extends Operation {
   }
 
   /**
-   * Synchronize customerId from siteId
+   * Synchronize customerId and apply (re-apply) agreement from siteId
    * @returns {Promise<void>}
    * @throws {Error} If the specified siteId does not exist
    */
-  async _syncCustomerId() {
+  async _syncCustomerIdAndApplyAgreement() {
     if (!this.siteId) return;
     const siteInstance = new Site();
     const siteExists = await siteInstance.fetch({ docId: this.siteId });
@@ -555,6 +555,7 @@ export default class OperationResult extends Operation {
       );
     }
     this.customerId = siteInstance.customerId;
+    this.agreement = siteInstance.getCurrentAgreement(this);
   }
 
   /**
@@ -564,12 +565,12 @@ export default class OperationResult extends Operation {
   async beforeCreate() {
     await super.beforeCreate();
 
-    // 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
    * @returns {Promise<void>}
    */
   async beforeUpdate() {
@@ -582,9 +583,9 @@ 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();
   }
 
   /**

package/src/SiteOperationSchedule.js

@@ -695,18 +695,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 +712,10 @@ export default class SiteOperationSchedule extends Operation {
         ...this.toObject(),
         employees,
         outsourcers,
-        agreement: agreement || null,
+        // agreement: agreement || null,
         siteOperationScheduleId: this.docId,
       });
-      operationResult.refreshBillingDateAt();
+      // operationResult.refreshBillingDateAt();
       await this.constructor.runTransaction(async (transaction) => {
         const docRef = await operationResult.create({
           docId: this.docId,