@shisyamo4131/air-guard-v2-schemas 2.3.8-dev.1 → 2.4.0

package/index.js

@@ -6,6 +6,7 @@ export { default as Company } from "./src/Company.js";
 export { default as Customer, CustomerMinimal } from "./src/Customer.js";
 export { default as CutoffDate } from "./src/utils/CutoffDate.js";
 export { default as Employee } from "./src/Employee.js";
+export { GeocodableMixin } from "./src/mixins/GeocodableMixin.js";
 export { default as OperationBilling } from "./src/OperationBilling.js";
 export { default as OperationResult } from "./src/OperationResult.js";
 export { default as OperationResultDetail } from "./src/OperationResultDetail.js";

package/package.json

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

package/src/Certification.js

@@ -6,6 +6,8 @@
  *
  * NOTE: 配列で管理されるので key が必要。2025-12-08 現在、資格名が重複することはない想定。
  * 但し、2バイト文字が key として適切かは要検討。
+ *
+ * @update 2025-12-26 Set default to null for expirationDateAt
  */
 import { BaseClass } from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
@@ -13,10 +15,10 @@ import { defField } from "./parts/fieldDefinitions.js";
 const classProps = {
   name: defField("name", { label: "資格名", required: true }),
   type: defField("certificationType", { required: true }),
-  issuedBy: defField("name", { label: "発行元" }),
-  issueDateAt: defField("dateAt", { label: "取得日", required: true }),
-  expirationDateAt: defField("dateAt", { label: "有効期限" }),
-  serialNumber: defField("oneLine", { label: "証明書番号" }),
+  issuedBy: defField("issuedBy"),
+  issueDateAt: defField("issueDateAt", { required: true }),
+  expirationDateAt: defField("expirationDateAt"),
+  serialNumber: defField("serialNumber"),
 };
 
 /**

package/src/Company.js

@@ -1,11 +1,12 @@
 /**
  * Company Model
- * @version 1.4.0
+ * @version 1.0.0
  * @author shisyamo4131
- * @update 2025-12-02 Add maintenance information properties.
- * @update 2025-12-01 Add Stripe integration fields (stripeCustomerId, subscription).
- * @update 2025-11-27 Add bank information fields for billing.
- * @update 2025-11-23 Set `usePrefix` to false.
+ * @update 2025-12-29 - Add `isCompleteRequiredFields` computed property.
+ * @update 2025-12-02 - Add maintenance information properties.
+ * @update 2025-12-01 - Add Stripe integration fields (stripeCustomerId, subscription).
+ * @update 2025-11-27 - Add bank information fields for billing.
+ * @update 2025-11-23 - Set `usePrefix` to false.
  */
 import FireModel from "@shisyamo4131/air-firebase-v2";
 import { defField } from "./parts/fieldDefinitions.js";
@@ -149,6 +150,25 @@ export default class Company extends FireModel {
         },
         set() {},
       },
+
+      // Check if all `required` fields are filled.
+      // Used for validating whether the Company info is complete.
+      isCompleteRequiredFields: {
+        enumerable: true,
+        configurable: true,
+        get() {
+          return !!(
+            this.companyName &&
+            this.companyNameKana &&
+            this.zipcode &&
+            this.prefCode &&
+            this.city &&
+            this.address &&
+            this.tel
+          );
+        },
+        set() {},
+      },
     });
 
     /*************************************************************************

package/src/Employee.js

@@ -31,7 +31,6 @@ const classProps = {
   employmentStatus: defField("employmentStatus", { required: true }),
   title: defField("title"),
   dateOfTermination: defField("dateOfTermination", {
-    default: null,
     component: {
       attrs: {
         required: ({ item }) =>
@@ -89,9 +88,7 @@ const classProps = {
 
   // Security guard related fields
   hasSecurityGuardRegistration: defField("check", { label: "警備員登録" }),
-  dateOfSecurityGuardRegistration: defField("dateAt", {
-    label: "警備員登録日",
-    default: null,
+  dateOfSecurityGuardRegistration: defField("dateOfSecurityGuardRegistration", {
     component: {
       attrs: {
         required: ({ item }) => item.hasSecurityGuardRegistration,

package/src/mixins/GeocodableMixin.js

@@ -0,0 +1,149 @@
+/**
+ * @file src/mixins/GeocodableMixin.js
+ * @description Geocoding 機能を提供する Mixin
+ */
+
+/**
+ * Geocoding 機能を提供する Mixin
+ * @param {Class} BaseClass - 継承元のクラス
+ * @returns {Class} Geocoding 機能を持つクラス
+ */
+export function GeocodableMixin(BaseClass) {
+  return class extends BaseClass {
+    /**
+     * Firestore 用のコンバーターを提供します。
+     * - location から geopoint を自動生成して Firestore に保存します。
+     * - toObject() は純粋なプレーンオブジェクトを返すため、コンポーネント側で安全に使用できます。
+     * @override
+     */
+    static converter() {
+      const superConverter = super.converter();
+      return {
+        toFirestore: (instance) => {
+          const obj = superConverter.toFirestore(instance);
+
+          // location から geopoint を生成
+          if (obj.location?.lat && obj.location?.lng) {
+            try {
+              const adapter = this.getAdapter();
+              const GeoPoint = adapter.GeoPoint;
+
+              if (GeoPoint) {
+                obj.geopoint = new GeoPoint(obj.location.lat, obj.location.lng);
+              }
+            } catch (error) {
+              console.warn(
+                `[${this.className}.converter] GeoPoint generation failed:`,
+                error
+              );
+              obj.geopoint = null;
+            }
+          } else {
+            obj.geopoint = null;
+          }
+
+          return obj;
+        },
+        fromFirestore: superConverter.fromFirestore,
+      };
+    }
+
+    /**
+     * 新しいドキュメントが作成される前に `location` を取得してセットします。
+     * @param {Object} args - Creation options.
+     * @param {boolean} [args.skipGeocoding=false] - Skip geocoding process.
+     * @returns {Promise<void>}
+     */
+    async beforeCreate(args = {}) {
+      await super.beforeCreate(args);
+
+      if (!args.skipGeocoding) {
+        await this._geocodeAndSetLocation("beforeCreate");
+      }
+    }
+
+    /**
+     * ドキュメントが更新される前に `location` を取得してセットします。
+     * 住所に変更がない場合はジオコーディングをスキップします。
+     * @param {Object} args - Update options.
+     * @param {boolean} [args.skipGeocoding=false] - Skip geocoding process.
+     * @returns {Promise<void>}
+     */
+    async beforeUpdate(args = {}) {
+      await super.beforeUpdate(args);
+
+      const currentFullAddress = this.fullAddress;
+      const previousFullAddress = this._beforeData?.fullAddress;
+
+      // 住所に変更がない場合、またはskipGeocodingがtrueの場合はスキップ
+      if (
+        args.skipGeocoding ||
+        (this._beforeData && currentFullAddress === previousFullAddress)
+      ) {
+        return;
+      }
+
+      await this._geocodeAndSetLocation("beforeUpdate");
+    }
+
+    /**
+     * ジオコーディング処理
+     * fullAddress から緯度・経度・正規化された住所を取得し、location に設定
+     * @private
+     * @param {string} context - 呼び出し元のコンテキスト（'beforeCreate' | 'beforeUpdate'）
+     */
+    async _geocodeAndSetLocation(context) {
+      const address = this.fullAddress;
+
+      if (!address || address.trim() === "") {
+        this.location = null;
+        return;
+      }
+
+      if (!GeocodableMixin._geocodingFunction) {
+        console.warn(
+          `[${this.constructor.className}.${context}] Geocoding function not set. Skipping geocoding.`
+        );
+        this.location = null;
+        return;
+      }
+
+      try {
+        const coordinates = await GeocodableMixin._geocodingFunction(address);
+
+        if (coordinates && coordinates.lat && coordinates.lng) {
+          this.location = {
+            formattedAddress: coordinates.formattedAddress || address,
+            lat: coordinates.lat,
+            lng: coordinates.lng,
+          };
+        } else {
+          this.location = null;
+        }
+      } catch (error) {
+        console.warn(
+          `[${this.constructor.className}.${context}] Geocoding failed:`,
+          error
+        );
+        this.location = null;
+      }
+    }
+  };
+}
+
+/**
+ * Geocoding 処理を行う関数（外部から注入）
+ * @type {Function|null}
+ * @static
+ */
+GeocodableMixin._geocodingFunction = null;
+
+/**
+ * Geocoding 関数を設定します。
+ * すべての GeocodableMixin を継承したクラスで共有されます。
+ * @param {Function} fn - 住所文字列を受け取り、{ lat, lng, formattedAddress } を返す非同期関数
+ * @static
+ */
+GeocodableMixin.setGeocodingFunction = function (fn) {
+  GeocodableMixin._geocodingFunction = fn;
+};

package/src/parts/fieldDefinitions.js

@@ -163,14 +163,39 @@ export const fieldDefinitions = {
   dateOfBirth: {
     ...generalDefinitions.dateAt,
     label: "生年月日",
+    default: null, // 2025-12-26 Set default to null
+    component: {
+      ...generalDefinitions.dateAt.component,
+      attrs: {
+        viewMode: "year", // 2025-12-26 Added
+      },
+    },
   },
   dateOfHire: {
     ...generalDefinitions.dateAt,
     label: "入社日",
   },
+  // 2025-12-26 Added
+  dateOfSecurityGuardRegistration: {
+    ...generalDefinitions.dateAt,
+    label: "警備員登録日",
+    default: null,
+  },
   dateOfTermination: {
     ...generalDefinitions.dateAt,
     label: "退職日",
+    default: null, // 2025-12-26 Set default to null
+  },
+  // 2025-12-26 Added
+  expirationDateAt: {
+    ...generalDefinitions.dateAt,
+    label: "有効期限",
+    default: null,
+  },
+  // 2025-12-26 Added
+  issueDateAt: {
+    ...generalDefinitions.dateAt,
+    label: "取得日",
   },
   periodOfStay: {
     ...generalDefinitions.dateAt,
@@ -350,6 +375,12 @@ export const fieldDefinitions = {
       },
     },
   },
+  // 2025-12-26 Added
+  issuedBy: {
+    ...generalDefinitions.oneLine,
+    label: "発行元",
+    length: 20,
+  },
   lastName: {
     ...generalDefinitions.oneLine,
     label: "姓",
@@ -409,6 +440,12 @@ export const fieldDefinitions = {
     label: "退職理由",
     length: 20,
   },
+  // 2025-12-26 Added
+  serialNumber: {
+    ...generalDefinitions.oneLine,
+    label: "証明書番号",
+    length: 20,
+  },
   siteId: {
     ...generalDefinitions.oneLine,
     label: "現場",