@shisyamo4131/air-guard-v2-schemas 2.4.2-dev.7 → 2.4.2-dev.71

package/src/utils/CutoffDate.js

@@ -16,6 +16,7 @@
  * @static {function} getDisplayText - Get display text for cutoff date value
  * @static {function} isValidCutoffDate - Validate cutoff date value
  *****************************************************************************/
+import { formatJstDate } from "./index.js";
 
 export default class CutoffDate {
   /**
@@ -88,7 +89,7 @@ export default class CutoffDate {
     const currentCutoffDay = CutoffDate.calculateActualCutoffDay(
       year,
       month,
-      cutoffDateValue
+      cutoffDateValue,
     );
 
     let periodStart, periodEnd, periodLabel;
@@ -102,14 +103,14 @@ export default class CutoffDate {
       const prevCutoffDay = CutoffDate.calculateActualCutoffDay(
         prevYear,
         normalizedPrevMonth,
-        cutoffDateValue
+        cutoffDateValue,
       );
 
       // Create dates in UTC representing JST dates (subtract 9 hours)
       const startJst = Date.UTC(
         prevYear,
         normalizedPrevMonth,
-        prevCutoffDay + 1
+        prevCutoffDay + 1,
       );
       const endJst = Date.UTC(year, month, currentCutoffDay);
 
@@ -125,7 +126,7 @@ export default class CutoffDate {
       const nextCutoffDay = CutoffDate.calculateActualCutoffDay(
         nextYear,
         normalizedNextMonth,
-        cutoffDateValue
+        cutoffDateValue,
       );
 
       // Create dates in UTC representing JST dates (subtract 9 hours)
@@ -136,7 +137,7 @@ export default class CutoffDate {
       periodEnd = new Date(endJst - 9 * 60 * 60 * 1000);
       periodLabel = `${nextYear}-${String(normalizedNextMonth + 1).padStart(
         2,
-        "0"
+        "0",
       )}`;
     }
 
@@ -157,7 +158,7 @@ export default class CutoffDate {
    */
   static getDisplayText(cutoffDateValue) {
     const option = CutoffDate.OPTIONS.find(
-      (opt) => opt.value === cutoffDateValue
+      (opt) => opt.value === cutoffDateValue,
     );
     return option ? option.title : "";
   }
@@ -197,7 +198,7 @@ export default class CutoffDate {
     const currentCutoffDay = CutoffDate.calculateActualCutoffDay(
       year,
       month,
-      cutoffDateValue
+      cutoffDateValue,
     );
 
     if (day <= currentCutoffDay) {
@@ -215,7 +216,7 @@ export default class CutoffDate {
       const nextCutoffDay = CutoffDate.calculateActualCutoffDay(
         nextYear,
         normalizedNextMonth,
-        cutoffDateValue
+        cutoffDateValue,
       );
 
       const cutoffJst = Date.UTC(nextYear, normalizedNextMonth, nextCutoffDay);
@@ -236,13 +237,8 @@ export default class CutoffDate {
   static calculateBillingDateAtString(salesDate, cutoffDateValue) {
     const cutoffDate = CutoffDate.calculateBillingDateAt(
       salesDate,
-      cutoffDateValue
+      cutoffDateValue,
     );
-    // Convert UTC back to JST for string representation
-    const jstDate = new Date(cutoffDate.getTime() + 9 * 60 * 60 * 1000);
-    const year = jstDate.getUTCFullYear();
-    const month = String(jstDate.getUTCMonth() + 1).padStart(2, "0");
-    const day = String(jstDate.getUTCDate()).padStart(2, "0");
-    return `${year}-${month}-${day}`;
+    return formatJstDate(cutoffDate);
   }
 }

package/src/utils/index.js

@@ -15,14 +15,14 @@ export function getDateAt(date, time, dateOffset = 0) {
   // If date is not null/undefined and is not a string or Date, throw an error
   if (date != null && !(typeof date === "string" || date instanceof Date)) {
     throw new Error(
-      `[getDateAt] Invalid date type. Expected string or Date, got ${typeof date}`
+      `[getDateAt] Invalid date type. Expected string or Date, got ${typeof date}`,
     );
   }
 
   // If time is not null and is not a string, throw an error
   if (time != null && typeof time !== "string") {
     throw new Error(
-      `[getDateAt] Invalid time type. Expected string, got ${typeof time}`
+      `[getDateAt] Invalid time type. Expected string, got ${typeof time}`,
     );
   }
 
@@ -31,18 +31,54 @@ export function getDateAt(date, time, dateOffset = 0) {
   const [hour, minute] = time ? time.split(":").map(Number) : [0, 0];
   if (isNaN(hour) || isNaN(minute)) {
     throw new Error(
-      `[getDateAt] Invalid time format. Expected HH:MM, got ${time}`
+      `[getDateAt] Invalid time format. Expected HH:MM, got ${time}`,
     );
   }
 
   // If date is not provided, use the current date
-  const result = new Date(date || Date.now());
+  const baseDate = new Date(date || Date.now());
 
-  // JSTはUTC+9なので、UTC時刻として設定してから9時間引く
-  result.setUTCHours(hour - 9, minute, 0, 0);
-  result.setUTCDate(result.getUTCDate() + dateOffset);
+  // 入力日時から JST の日付成分を取得してから、JST時刻を合成する。
+  // これにより、UTC日付境界を跨ぐケースでも期待通りの JST 日付を保てる。
+  const jstDate = new Date(baseDate.getTime() + 9 * 60 * 60 * 1000);
+  const year = jstDate.getUTCFullYear();
+  const month = jstDate.getUTCMonth();
+  const day = jstDate.getUTCDate();
 
-  return result;
+  const utcMillis = Date.UTC(
+    year,
+    month,
+    day + dateOffset,
+    hour - 9,
+    minute,
+    0,
+    0,
+  );
+  return new Date(utcMillis);
+}
+
+/**
+ * DateオブジェクトをJST基準の文字列に変換
+ * UTCとして保存されているJST時刻を、JST日付の文字列表現に変換します。
+ * @param {Date} dateAt - UTCとして保存されたJST時刻
+ * @param {string} format - 'YYYY-MM-DD' | 'YYYY-MM'
+ * @returns {string|null} フォーマットされた日付文字列。dateAtがnull/undefinedの場合はnullを返す。
+ * @example
+ * // YYYY-MM-DD形式
+ * formatJstDate(new Date('2024-03-04T15:00:00Z')) // '2024-03-05'
+ * 
+ * // YYYY-MM形式
+ * formatJstDate(new Date('2024-03-04T15:00:00Z'), 'YYYY-MM') // '2024-03'
+ */
+export function formatJstDate(dateAt, format = "YYYY-MM-DD") {
+  if (!dateAt) return null;
+
+  const jstDate = new Date(dateAt.getTime() + 9 * 60 * 60 * 1000);
+  const year = jstDate.getUTCFullYear();
+  const month = String(jstDate.getUTCMonth() + 1).padStart(2, "0");
+  const day = String(jstDate.getUTCDate()).padStart(2, "0");
+
+  return format === "YYYY-MM" ? `${year}-${month}` : `${year}-${month}-${day}`;
 }
 
 export { ContextualError } from "./ContextualError.js";