@shisyamo4131/air-guard-v2-schemas 1.3.1-dev.21 → 1.3.1-dev.23

package/package.json

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

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,8 +40,7 @@ const STATUS = {
 const classProps = {
   customerId: defField("customerId", { required: true }),
   siteId: defField("siteId", { required: true }),
-  billingMonth: defField("oneLine", { required: true }),
-  billingDateAt: defField("dateAt"),
+  billingDateAt: defField("dateAt", { required: true }),
   paymentDueDateAt: defField("dateAt"),
 
   // 入金管理用配列（現時点では未使用 将来の拡張用）
@@ -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() {
@@ -100,7 +171,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 getPaymentDueAt
+ * @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表現）
+   */
+  getPaymentDueAt(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);
+  }
 }
 
 /*****************************************************************************