@chevre/domain 28.1.0-alpha.0 → 28.1.0-alpha.2

package/lib/chevre/repo/adminAcceptedOffer.d.ts

@@ -34,12 +34,6 @@ export declare class AdminAcceptedOfferRepo extends AcceptedOfferInReserveRepo {
      * 索条件を最小化(2026-06-05~)
      */
     params: Pick<factory.order.ISearchConditions, 'limit' | 'orderNumbers' | 'page' | 'project' | 'provider' | 'sort' | 'orderDate'>, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
-        /**
-         * reservationForをid属性のみにするオプション
-         * 2026-08-31~
-         * always true(2026-10-08~)
-         */
-        minimizeReservationFor: true;
         /**
          * reservedTicket以外の属性を除外するオプション
          * 2026-10-08~
@@ -67,17 +61,12 @@ export declare class AdminAcceptedOfferRepo extends AcceptedOfferInReserveRepo {
             id: string;
         };
     }, options: {
-        /**
-         * reservationForをid属性のみにするオプション
-         * 2026-08-31~
-         * always true(2026-10-08~)
-         */
-        minimizeReservationFor: true;
         /**
          * reservedTicket以外の属性を除外するオプション
          * 2026-10-08~
+         * always true(2026-10-23~)
          */
-        onlyReservedTicket: boolean;
+        onlyReservedTicket: true;
         /**
          * reservedTicketからticketTypeを除外するオプション
          * 2026-10-23~

package/lib/chevre/repo/adminAcceptedOffer.js

@@ -7,45 +7,40 @@ const settings_1 = require("../settings");
 const acceptedOfferInReserve_1 = require("./acceptedOfferInReserve");
 const order_2 = require("./order");
 function minimizeItemOffered(itemOffered, options) {
-    const { minimizeReservationFor, onlyReservedTicket, minimizeReservedTicket } = options;
-    if (minimizeReservationFor) {
-        const { reservationFor, ...itemOfferedWithoutEvent } = itemOffered;
-        if (onlyReservedTicket) {
-            const { id, reservationNumber, reservedTicket } = itemOfferedWithoutEvent;
-            // support minimizeReservedTicket(2026-10-23~)
-            if (minimizeReservedTicket) {
-                const { coaReserveAmount, coaTicketInfo, ticketToken, identifier, ticketedSeat } = reservedTicket;
-                return {
-                    id, reservationNumber,
-                    reservedTicket: {
-                        typeOf: reservedTicket.typeOf,
-                        identifier,
-                        ...(typeof ticketedSeat?.typeOf === 'string') && { ticketedSeat },
-                        ...(coaReserveAmount !== undefined) && { coaReserveAmount },
-                        ...(coaTicketInfo !== undefined) && { coaTicketInfo },
-                        ...(typeof ticketToken === 'string') && { ticketToken },
-                    },
-                    typeOf: itemOfferedWithoutEvent.typeOf,
-                    reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf }
-                };
-            }
-            else {
-                return {
-                    id, reservationNumber, reservedTicket,
-                    typeOf: itemOfferedWithoutEvent.typeOf,
-                    reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf }
-                };
-            }
+    const { onlyReservedTicket, minimizeReservedTicket } = options;
+    const { reservationFor, ...itemOfferedWithoutEvent } = itemOffered;
+    if (onlyReservedTicket) {
+        const { id, reservationNumber, reservedTicket } = itemOfferedWithoutEvent;
+        // support minimizeReservedTicket(2026-10-23~)
+        if (minimizeReservedTicket) {
+            const { coaReserveAmount, coaTicketInfo, ticketToken, identifier, ticketedSeat } = reservedTicket;
+            return {
+                id, reservationNumber,
+                reservedTicket: {
+                    typeOf: reservedTicket.typeOf,
+                    identifier,
+                    ...(typeof ticketedSeat?.typeOf === 'string') && { ticketedSeat },
+                    ...(coaReserveAmount !== undefined) && { coaReserveAmount },
+                    ...(coaTicketInfo !== undefined) && { coaTicketInfo },
+                    ...(typeof ticketToken === 'string') && { ticketToken },
+                },
+                typeOf: itemOfferedWithoutEvent.typeOf,
+                reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf }
+            };
         }
         else {
             return {
-                ...itemOfferedWithoutEvent,
+                id, reservationNumber, reservedTicket,
+                typeOf: itemOfferedWithoutEvent.typeOf,
                 reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf }
             };
         }
     }
     else {
-        return itemOffered;
+        return {
+            ...itemOfferedWithoutEvent,
+            reservationFor: { id: reservationFor.id, typeOf: reservationFor.typeOf }
+        };
     }
 }
 /**

package/lib/chevre/repo/factory/reservation/minimizeReservationFor.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.minimizeReservationFor = minimizeReservationFor;
-const USE_DEPRECATED_RESERVATION_FOR = process.env.USE_DEPRECATED_RESERVATION_FOR === '1';
 function minimizeWorkPerformed(params) {
     const { identifier, id, typeOf, version } = params;
     return {
@@ -29,10 +28,6 @@ function minimizeRoom(params) {
     return { branchCode, typeOf };
 }
 function minimizeReservationFor(params) {
-    if (USE_DEPRECATED_RESERVATION_FOR) {
-        // 互換性維持対応として
-        return { minimizedReservationFor: params }; // eslint-disable-line @typescript-eslint/no-explicit-any
-    }
     const { name: _name, doorTime: _doorTime, superEvent, location, ...reservationForNoName } = params;
     const minimizedReservationFor = {
         ...reservationForNoName,

package/lib/chevre/repo/mongoose/schemas/offerCatalog.d.ts

@@ -1,7 +1,7 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import { IVirtuals } from '../virtuals';
 import { factory } from '../../../factory';
-export type IDocType = Omit<factory.offerCatalog.IOfferCatalog, 'id'> & {
+export type IDocType = Pick<factory.offerCatalog.IOfferCatalog, 'description' | 'identifier' | 'itemListElement' | 'itemOffered' | 'name' | 'project' | 'typeOf'> & {
     _id: string;
     dateSynced?: Date;
 };

package/lib/chevre/repo/mongoose/schemas/offerCatalog.js

@@ -13,11 +13,10 @@ const schemaDefinition = {
     identifier: { type: String, required: true },
     name: mongoose_1.SchemaTypes.Mixed,
     description: mongoose_1.SchemaTypes.Mixed,
-    // alternateName: SchemaTypes.Mixed,
     typeOf: { type: String, required: true },
     itemListElement: [mongoose_1.SchemaTypes.Mixed],
     itemOffered: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    // additionalProperty: [SchemaTypes.Mixed], // TODO discontinue(2026-10-31~)
     dateSynced: Date // 追加(2023-09-13~)
 };
 const schemaOptions = {
@@ -78,24 +77,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { 'itemOffered.serviceType.codeValue': 1, identifier: 1 },
-        {
-            name: 'searchByItemOfferedServiceTypeCodeValue',
-            partialFilterExpression: {
-                'itemOffered.serviceType.codeValue': { $exists: true }
-            }
-        }
-    ],
-    [
-        { additionalProperty: 1, identifier: 1 },
-        {
-            name: 'searchByAdditionalProperty',
-            partialFilterExpression: {
-                additionalProperty: { $exists: true }
-            }
-        }
-    ],
     [
         // add unique index(2024-11-12~)
         { 'project.id': 1, identifier: 1 },
@@ -104,6 +85,25 @@ const indexes = [
             name: 'uniqueIdentifier'
         }
     ]
+    // 以下廃止(2026-10-31~)
+    // [
+    //     { 'itemOffered.serviceType.codeValue': 1, identifier: 1 },
+    //     {
+    //         name: 'searchByItemOfferedServiceTypeCodeValue',
+    //         partialFilterExpression: {
+    //             'itemOffered.serviceType.codeValue': { $exists: true }
+    //         }
+    //     }
+    // ],
+    // [
+    //     { additionalProperty: 1, identifier: 1 },
+    //     {
+    //         name: 'searchByAdditionalProperty',
+    //         partialFilterExpression: {
+    //             additionalProperty: { $exists: true }
+    //         }
+    //     }
+    // ],
 ];
 exports.indexes = indexes;
 /**

package/lib/chevre/repo/mongoose/schemas/setting.d.ts

@@ -69,6 +69,10 @@ interface ITriggerWebhookSettings {
     headerIdentifier?: string;
     retryCountMax?: number;
     retryIntervalInMS?: number;
+    /**
+     * support(2026-10-30~)
+     */
+    googleTargetAudience?: string;
 }
 export interface IWaiterSettings {
     disabled?: boolean;

package/lib/chevre/repo/offerCatalog.d.ts

@@ -1,11 +1,11 @@
 import type { Connection, FilterQuery, mongo } from 'mongoose';
 import { factory } from '../factory';
 import { IDocType } from './mongoose/schemas/offerCatalog';
-export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered' | 'additionalProperty'> & {
+export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'project' | 'typeOf' | 'identifier' | 'itemOffered'> & {
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer | 'OfferCatalog';
 };
-type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced';
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced';
 /**
  * カタログリポジトリ
  */
@@ -168,14 +168,14 @@ export declare class OfferCatalogRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.offerCatalog.IOfferCatalog, "identifier" | "name" | "typeOf" | "description" | "itemOffered" | "project" | "itemListElement"> & {
         _id: string;
         dateSynced?: Date;
     } & Required<{
         _id: string;
     }> & {
         __v: number;
-    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Omit<factory.offerCatalog.IOfferCatalog, "id"> & {
+    }, import("mongoose").QueryOptions<IDocType>, (import("mongoose").Document<unknown, Record<string, never>, IDocType, import("./mongoose/virtuals").IVirtuals, {}> & Pick<factory.offerCatalog.IOfferCatalog, "identifier" | "name" | "typeOf" | "description" | "itemOffered" | "project" | "itemListElement"> & {
         _id: string;
         dateSynced?: Date;
     } & Required<{

package/lib/chevre/repo/offerCatalog.js

@@ -10,7 +10,7 @@ const AVAILABLE_PROJECT_FIELDS = [
     'typeOf',
     'identifier',
     'itemOffered',
-    'additionalProperty',
+    // 'additionalProperty',
     'numberOfItems',
     'itemListElementTypeOf',
     'dateSynced'
@@ -104,24 +104,24 @@ class OfferCatalogRepo {
                 }
             });
         }
-        const itemOfferedServiceTypeCodeValueEq = params.itemOffered?.serviceType?.codeValue?.$eq;
-        if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
-            andConditions.push({
-                'itemOffered.serviceType.codeValue': {
-                    $exists: true,
-                    $eq: itemOfferedServiceTypeCodeValueEq
-                }
-            });
-        }
-        const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
-        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-            andConditions.push({
-                additionalProperty: {
-                    $exists: true,
-                    $elemMatch: additionalPropertyElemMatch
-                }
-            });
-        }
+        // const itemOfferedServiceTypeCodeValueEq = params.itemOffered?.serviceType?.codeValue?.$eq;
+        // if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
+        //     andConditions.push({
+        //         'itemOffered.serviceType.codeValue': {
+        //             $exists: true,
+        //             $eq: itemOfferedServiceTypeCodeValueEq
+        //         }
+        //     });
+        // }
+        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
+        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+        //     andConditions.push({
+        //         additionalProperty: {
+        //             $exists: true,
+        //             $elemMatch: additionalPropertyElemMatch
+        //         }
+        //     });
+        // }
         return andConditions;
     }
     async save(params) {

package/lib/chevre/repo/offerCatalogItem.d.ts

@@ -6,7 +6,7 @@ export type IAggregatedOfferCatalog = Pick<factory.offerCatalog.IOfferCatalog, '
     numberOfItems?: number;
     itemListElementTypeOf: factory.offerType.Offer;
 };
-type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'additionalProperty' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced' | 'relatedOffer';
+type IKeyOfProjection = 'name' | 'description' | 'project' | 'typeOf' | 'id' | 'identifier' | 'itemOffered' | 'numberOfItems' | 'itemListElementTypeOf' | 'dateSynced' | 'relatedOffer';
 /**
  * サブカタログリポジトリ
  */

package/lib/chevre/repo/offerCatalogItem.js

@@ -11,7 +11,7 @@ const AVAILABLE_PROJECT_FIELDS = [
     'typeOf',
     'identifier',
     'itemOffered',
-    'additionalProperty',
+    // 'additionalProperty',
     'numberOfItems',
     'itemListElementTypeOf',
     'dateSynced',
@@ -81,14 +81,14 @@ class OfferCatalogItemRepo {
         if (typeof itemOfferedTypeOfEq === 'string') {
             andConditions.push({ 'itemOffered.typeOf': { $exists: true, $eq: itemOfferedTypeOfEq } });
         }
-        const itemOfferedServiceTypeCodeValueEq = params.itemOffered?.serviceType?.codeValue?.$eq;
-        if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
-            andConditions.push({ 'itemOffered.serviceType.codeValue': { $exists: true, $eq: itemOfferedServiceTypeCodeValueEq } });
-        }
-        const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
-        if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
-            andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
-        }
+        // const itemOfferedServiceTypeCodeValueEq = params.itemOffered?.serviceType?.codeValue?.$eq;
+        // if (typeof itemOfferedServiceTypeCodeValueEq === 'string') {
+        //     andConditions.push({ 'itemOffered.serviceType.codeValue': { $exists: true, $eq: itemOfferedServiceTypeCodeValueEq } });
+        // }
+        // const additionalPropertyElemMatch = params.additionalProperty?.$elemMatch;
+        // if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
+        //     andConditions.push({ additionalProperty: { $exists: true, $elemMatch: additionalPropertyElemMatch } });
+        // }
         const appliesToMovieTicketServiceOutputTypeOfIn = params.relatedOffer?.priceSpecification?.appliesToMovieTicket?.serviceOutput?.typeOf?.$in;
         if (Array.isArray(appliesToMovieTicketServiceOutputTypeOfIn)) {
             andConditions.push({

package/lib/chevre/service/notification/triggerWebhook/getGoogleIdTokenClient.d.ts

@@ -0,0 +1,5 @@
+import { IdTokenClient } from 'google-auth-library';
+/**
+ * 指定した targetAudience に対応する IdTokenClient を取得（キャッシュ対応）
+ */
+export declare function getGoogleIdTokenClient(targetAudience: string): Promise<IdTokenClient>;

package/lib/chevre/service/notification/triggerWebhook/getGoogleIdTokenClient.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getGoogleIdTokenClient = getGoogleIdTokenClient;
+const google_auth_library_1 = require("google-auth-library");
+// GoogleAuth のベースインスタンスは 1 つで共有
+let auth;
+// Audience ごとに生成したクライアントを保持するキャッシュ
+const idTokenClients = new Map();
+const initPromises = new Map();
+/**
+ * 指定した targetAudience に対応する IdTokenClient を取得（キャッシュ対応）
+ */
+async function getGoogleIdTokenClient(targetAudience) {
+    if (typeof targetAudience !== 'string' || targetAudience === '') {
+        throw new Error('targetAudience is required.');
+    }
+    // 1. 既に生成済みのインスタンスがあれば即座に返す（メモリ参照のみ、負荷ゼロ）
+    const cachedClient = idTokenClients.get(targetAudience);
+    if (cachedClient !== undefined) {
+        return cachedClient;
+    }
+    if (auth === undefined) {
+        auth = new google_auth_library_1.GoogleAuth();
+    }
+    // 2. 起動直後など、同一 Audience への多重初期化を防ぐ（Promise キャッシュ）
+    let promise = initPromises.get(targetAudience);
+    if (promise === undefined) {
+        promise = auth.getIdTokenClient(targetAudience)
+            .then((client) => {
+            idTokenClients.set(targetAudience, client);
+            return client;
+        }).finally(() => {
+            // 成功・失敗にかかわらず進行中フラグ（Promise）を掃除する
+            initPromises.delete(targetAudience);
+        });
+        initPromises.set(targetAudience, promise);
+    }
+    return promise;
+}

package/lib/chevre/service/notification/triggerWebhook.js

@@ -37,6 +37,7 @@ exports.triggerWebhook = triggerWebhook;
 const crypto = __importStar(require("crypto"));
 const http_status_1 = require("http-status");
 const factory_1 = require("../../factory");
+const getGoogleIdTokenClient_1 = require("./triggerWebhook/getGoogleIdTokenClient");
 const USERNAME_ARGUMENT_REQUIRED_MESSAGE = 'Missing required key \'Username\' in params';
 function triggerWebhook(params) {
     return async (repos) => {
@@ -141,11 +142,40 @@ function signRequest(params) {
         .update(payload)
         .digest('hex');
 }
+async function makeRequestHeaders(action, options, requestBody) {
+    const secretKey = options?.triggerWebhook?.secretKey;
+    const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
+    const googleTargetAudience = options?.triggerWebhook?.googleTargetAudience;
+    const timestamp = action.startDate.valueOf();
+    // sign request(2024-10-28~)
+    let signature;
+    if (typeof secretKey === 'string' && secretKey !== ''
+        && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+        signature = signRequest({ requestBody, timestamp, secretKey });
+    }
+    const headers = new Headers({ 'Content-Type': 'application/json' });
+    if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
+        headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
+        if (typeof signature === 'string') {
+            headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
+        }
+    }
+    // support googleAuth(2026-10-30~)
+    if (typeof googleTargetAudience === 'string' && googleTargetAudience !== '') {
+        const idTokenClient = await (0, getGoogleIdTokenClient_1.getGoogleIdTokenClient)(googleTargetAudience);
+        // getRequestHeaders() からキャッシュ済みの "Bearer eyJhbG..." を取得
+        const requestHeaders = await idTokenClient.getRequestHeaders();
+        const idToken = requestHeaders.get('authorization'); // "Bearer eyJhbG..."
+        if (typeof idToken === 'string') {
+            // IAPを通過するための認証（Googleが認識するヘッダー）
+            headers.append('Proxy-Authorization', idToken);
+        }
+    }
+    return headers;
+}
 function processInformAction(params, options) {
     return async (repos) => {
         const timeout = options?.triggerWebhook?.timeout;
-        const secretKey = options?.triggerWebhook?.secretKey;
-        const headerIdentifier = options?.triggerWebhook?.headerIdentifier;
         const { identifier } = params;
         const informActionAttributes = await createInformActionAttributes(params)(repos);
         const action = await repos.actions.inform.startInformAction(informActionAttributes);
@@ -161,20 +191,7 @@ function processInformAction(params, options) {
                         ? { identifier }
                         : undefined
                 });
-                const timestamp = action.startDate.valueOf();
-                // sign request(2024-10-28~)
-                let signature;
-                if (typeof secretKey === 'string' && secretKey !== ''
-                    && typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-                    signature = signRequest({ requestBody, timestamp, secretKey });
-                }
-                const headers = new Headers({ 'Content-Type': 'application/json' });
-                if (typeof headerIdentifier === 'string' && headerIdentifier !== '') {
-                    headers.append(`X-${headerIdentifier}-Webhook-Timestamp`, String(timestamp));
-                    if (typeof signature === 'string') {
-                        headers.append(`X-${headerIdentifier}-Webhook-Signature`, signature);
-                    }
-                }
+                const headers = await makeRequestHeaders(action, options, requestBody);
                 const res = await fetch(urlTemplate, {
                     method: 'POST',
                     headers,

package/lib/chevre/service/offer/event/searchOfferCatalogItems.d.ts

@@ -3,7 +3,7 @@ import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
 import type { OfferCatalogItemRepo } from '../../../repo/offerCatalogItem';
 import type { ProductRepo } from '../../../repo/product';
 import { factory } from '../../../factory';
-type ISearchOfferCatalogItemResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'additionalProperty' | 'relatedOffer'> & {
+type ISearchOfferCatalogItemResult = Pick<factory.offerCatalog.IOfferCatalog, 'id' | 'name' | 'description' | 'relatedOffer'> & {
     elementIndex: number;
 };
 /**

package/package.json

@@ -11,12 +11,13 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.1090.0",
     "@aws-sdk/credential-providers": "3.1090.0",
-    "@chevre/factory": "11.1.0",
+    "@chevre/factory": "11.2.0-alpha.0",
     "@motionpicture/coa-service": "10.0.0",
     "@motionpicture/gmo-service": "6.1.0-alpha.0",
     "@sendgrid/client": "8.1.4",
     "@surfrock/sdk": "2.0.0",
     "debug": "4.4.3",
+    "google-auth-library": "11.3.2",
     "http-status": "2.1.0",
     "jsonwebtoken": "9.0.0",
     "libphonenumber-js": "1.13.8",
@@ -88,5 +89,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build"
   },
-  "version": "28.1.0-alpha.0"
+  "version": "28.1.0-alpha.2"
 }