@chevre/domain 23.1.0-alpha.5 → 23.1.0-alpha.6

package/example/src/chevre/assetTransaction/processReserve.ts

@@ -102,6 +102,7 @@ async function main() {
             eventOffer: await chevre.repository.EventOffer.createInstance(mongoose.connection),
             eventSeries: await chevre.repository.EventSeries.createInstance(mongoose.connection),
             issuer: await chevre.repository.Issuer.createInstance(mongoose.connection),
+            member: await chevre.repository.Member.createInstance(mongoose.connection),
             memberProgram: await chevre.repository.MemberProgram.createInstance(mongoose.connection),
             offer: await chevre.repository.Offer.createInstance(mongoose.connection),
             offerCatalog: await chevre.repository.OfferCatalog.createInstance(mongoose.connection),

package/example/src/chevre/authorizeEventServiceOffer.ts

@@ -57,6 +57,7 @@ async function main() {
             eventOffer: await chevre.repository.EventOffer.createInstance(mongoose.connection),
             eventSeries: await chevre.repository.EventSeries.createInstance(mongoose.connection),
             issuer: await chevre.repository.Issuer.createInstance(mongoose.connection),
+            member: await chevre.repository.Member.createInstance(mongoose.connection),
             memberProgram: await chevre.repository.MemberProgram.createInstance(mongoose.connection),
             stockHolder: await chevre.repository.StockHolder.createInstance({ connection: mongoose.connection }),
             offer: await chevre.repository.Offer.createInstance(mongoose.connection),

package/lib/chevre/repo/eventOffer.js

@@ -32,7 +32,7 @@ class EventOfferRepo {
         this.eventOfferModel = connection.model(eventOffer_1.modelName, (0, eventOffer_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s;
         const andConditions = [];
         const idEq = (_a = params.id) === null || _a === void 0 ? void 0 : _a.$eq;
         if (typeof idEq === 'string') {
@@ -58,19 +58,23 @@ class EventOfferRepo {
         if (Array.isArray(itemOfferedIdIn)) {
             andConditions.push({ 'itemOffered.id': { $in: itemOfferedIdIn } });
         }
-        const offeredByIdEq = (_l = (_k = params.offeredBy) === null || _k === void 0 ? void 0 : _k.id) === null || _l === void 0 ? void 0 : _l.$eq;
+        const availableAtOrFromIdentifierEq = (_l = (_k = params.availableAtOrFrom) === null || _k === void 0 ? void 0 : _k.identifier) === null || _l === void 0 ? void 0 : _l.$eq;
+        if (typeof availableAtOrFromIdentifierEq === 'string') {
+            andConditions.push({ 'availableAtOrFrom.identifier': { $eq: availableAtOrFromIdentifierEq } });
+        }
+        const offeredByIdEq = (_o = (_m = params.offeredBy) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
         if (typeof offeredByIdEq === 'string') {
             andConditions.push({ 'offeredBy.id': { $exists: true, $eq: offeredByIdEq } });
         }
-        const sellerByIdEq = (_o = (_m = params.seller) === null || _m === void 0 ? void 0 : _m.id) === null || _o === void 0 ? void 0 : _o.$eq;
+        const sellerByIdEq = (_q = (_p = params.seller) === null || _p === void 0 ? void 0 : _p.id) === null || _q === void 0 ? void 0 : _q.$eq;
         if (typeof sellerByIdEq === 'string') {
             andConditions.push({ 'seller.id': { $eq: sellerByIdEq } });
         }
-        const validFromLte = (_p = params.validFrom) === null || _p === void 0 ? void 0 : _p.$lte;
+        const validFromLte = (_r = params.validFrom) === null || _r === void 0 ? void 0 : _r.$lte;
         if (validFromLte instanceof Date) {
             andConditions.push({ validFrom: { $lte: validFromLte } });
         }
-        const validThroughGte = (_q = params.validThrough) === null || _q === void 0 ? void 0 : _q.$gte;
+        const validThroughGte = (_s = params.validThrough) === null || _s === void 0 ? void 0 : _s.$gte;
         if (validThroughGte instanceof Date) {
             andConditions.push({ validThrough: { $gte: validThroughGte } });
         }

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

@@ -2,7 +2,13 @@ import type { Connection, FilterQuery } from 'mongoose';
 import * as factory from '../factory';
 import { IGlobalMember } from './mongoose/schemas/member/global';
 type IKeyOfProjection = keyof factory.iam.IMember;
-export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'>;
+export type ICustomerMember = Pick<factory.iam.IMemberOfRole, 'hasRole' | 'id' | 'name' | 'memberOf'> & {
+    /**
+     * アプリケーションコード
+     * 2025-11-13~
+     */
+    identifier?: string;
+};
 /**
  * IAMメンバーリポジトリ
  */

package/lib/chevre/repo/member.js

@@ -138,6 +138,7 @@ class MemberRepo {
                     // typeOf: 'WebApplication',
                     hasRole: '$member.hasRole',
                     id: '$member.id',
+                    identifier: '$member.identifier',
                     member: '$member.member',
                     memberOf: '$member.memberOf',
                     name: '$member.name'

package/lib/chevre/service/assetTransaction/reserve/start.d.ts

@@ -6,6 +6,7 @@ import type { EventRepo } from '../../../repo/event';
 import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -27,6 +28,7 @@ interface IStartOperationRepos {
     eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

package/lib/chevre/service/assetTransaction/reserve/start.js

@@ -49,6 +49,7 @@ function start(params, options) {
         })({
             eventOffer: repos.eventOffer,
             issuer: repos.issuer,
+            member: repos.member,
             memberProgram: repos.memberProgram,
             productOffer: repos.productOffer
         });

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/fixExtendedEventOffer.d.ts

@@ -0,0 +1,22 @@
+import * as factory from '../../../../factory';
+import { IMinimizedIndividualEvent } from '../../../../factory/event';
+import type { EventOfferRepo } from '../../../../repo/eventOffer';
+import type { MemberRepo } from '../../../../repo/member';
+/**
+ * リクエストから拡張イベントオファーを決定する
+ */
+declare function fixExtendedEventOffer(params: {
+    event: Pick<IMinimizedIndividualEvent, 'offers' | 'id' | 'project' | 'identifier'>;
+    now: Date;
+    availableAt: {
+        /**
+         * 販売アプリケーションID
+         */
+        id: string;
+    };
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+}): (repos: {
+    eventOffer: EventOfferRepo;
+    member: MemberRepo;
+}) => Promise<Pick<factory.eventOffer.IEventOffer, "identifier" | "itemOffered" | "typeOf" | "offeredBy" | "validFrom" | "validThrough">>;
+export { fixExtendedEventOffer };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/fixExtendedEventOffer.js

@@ -0,0 +1,62 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fixExtendedEventOffer = fixExtendedEventOffer;
+const moment = require("moment");
+const factory = require("../../../../factory");
+/**
+ * リクエストから拡張イベントオファーを決定する
+ */
+function fixExtendedEventOffer(params) {
+    return (repos) => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b;
+        const { event, availableAt } = params;
+        const acceptedDate = moment(params.now);
+        // リクエストによるオファーコード指定が必須
+        const eventOfferIdentifierMustBe = (_b = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.offers) === null || _b === void 0 ? void 0 : _b.identifier;
+        if (typeof eventOfferIdentifierMustBe !== 'string' || eventOfferIdentifierMustBe === '') {
+            throw new factory.errors.ArgumentNull('reservationFor.offers.identifier');
+        }
+        // アプリケーションIDからアプリケーションコードを参照
+        const existingCustomerMember = (yield repos.member.searchCustomerMembers({
+            project: { id: event.project.id },
+            limit: 1,
+            page: 1,
+            member: {
+                id: { $eq: availableAt.id }
+            }
+        })).shift();
+        if (existingCustomerMember === undefined) {
+            throw new factory.errors.NotFound(`Member: ${availableAt.id}`);
+        }
+        // tslint:disable-next-line:no-console
+        console.log('existingCustomerMember found:', JSON.stringify(existingCustomerMember));
+        const applicationIdentifier = existingCustomerMember.member.identifier;
+        if (typeof applicationIdentifier !== 'string') {
+            throw new factory.errors.NotFound(`member.identifier of ${availableAt.id}`);
+        }
+        // アプリケーションコードで利用可能な拡張オファーを検索
+        const existingEventOffer = (yield repos.eventOffer.findEventOffers({
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: event.project.id } }, // プロジェクト
+            validFrom: { $lte: acceptedDate.toDate() },
+            validThrough: { $gte: acceptedDate.toDate() },
+            itemOffered: { id: { $eq: event.id } }, // 対象イベント
+            identifier: { $eq: eventOfferIdentifierMustBe }, // オファーコード
+            availableAtOrFrom: { identifier: { $eq: applicationIdentifier } } // アプリケーションコード
+        }, ['identifier', 'itemOffered', 'offeredBy', 'typeOf', 'validFrom', 'validThrough'])).shift();
+        if (existingEventOffer === undefined) {
+            throw new factory.errors.NotFound(`eventOffer: ${eventOfferIdentifierMustBe}`);
+        }
+        return existingEventOffer;
+    });
+}

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.d.ts

@@ -2,6 +2,7 @@ import * as factory from '../../../factory';
 import { IMinimizedIndividualEvent } from '../../../factory/event';
 import type { EventOfferRepo } from '../../../repo/eventOffer';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { ProductOfferRepo } from '../../../repo/productOffer';
 declare function validateStartRequest(params: {
@@ -22,6 +23,7 @@ declare function validateStartRequest(params: {
 }): (repos: {
     eventOffer: EventOfferRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     productOffer: ProductOfferRepo;
 }) => Promise<void>;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -12,6 +12,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateStartRequest = validateStartRequest;
 const moment = require("moment");
 const factory = require("../../../factory");
+const fixExtendedEventOffer_1 = require("./validateStartRequest/fixExtendedEventOffer");
 const validateIssuedOfferIfExists_1 = require("./validateStartRequest/validateIssuedOfferIfExists");
 const validateMemberTierIfExists_1 = require("./validateStartRequest/validateMemberTierIfExists");
 function validateStartRequest(params) {
@@ -40,7 +41,6 @@ function validateStartRequest(params) {
  */
 function validateApplicationOffer(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
         const { event, availableAt } = params;
         const acceptedDate = moment(params.now);
         const eventOffers = event.offers;
@@ -70,23 +70,7 @@ function validateApplicationOffer(params) {
         }
         // support extensibleEventOffer(2025-11-11~)
         if (eventOffers.typeOf === factory.offerType.AggregateOffer) {
-            // リクエストによるオファーコード指定が必須
-            const eventOfferIdentifierMustBe = (_b = (_a = params.object.reservationFor) === null || _a === void 0 ? void 0 : _a.offers) === null || _b === void 0 ? void 0 : _b.identifier;
-            if (typeof eventOfferIdentifierMustBe !== 'string' || eventOfferIdentifierMustBe === '') {
-                throw new factory.errors.ArgumentNull('reservationFor.offers.identifier');
-            }
-            const existingEventOffer = (yield repos.eventOffer.findEventOffers({
-                limit: 1,
-                page: 1,
-                project: { id: { $eq: event.project.id } }, // プロジェクト
-                validFrom: { $lte: acceptedDate.toDate() },
-                validThrough: { $gte: acceptedDate.toDate() },
-                itemOffered: { id: { $eq: event.id } }, // 対象イベント
-                identifier: { $eq: eventOfferIdentifierMustBe } // オファーコード
-            }, ['identifier', 'itemOffered', 'offeredBy', 'typeOf', 'validFrom', 'validThrough'])).shift();
-            if (existingEventOffer === undefined) {
-                throw new factory.errors.NotFound(`eventOffer: ${eventOfferIdentifierMustBe}`);
-            }
+            const existingEventOffer = yield (0, fixExtendedEventOffer_1.fixExtendedEventOffer)(params)(repos);
             // 拡張可能なオファー設定の場合のみ、オファートークンを検証する(2025-11-11~)
             yield (0, validateIssuedOfferIfExists_1.validateIssuedOfferIfExists)({
                 event,

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -8,6 +8,7 @@ import type { EventRepo, IMinimizedIndividualEvent } from '../../../../repo/even
 import type { EventOfferRepo } from '../../../../repo/eventOffer';
 import { EventSeriesRepo } from '../../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../../repo/issuer';
+import type { MemberRepo } from '../../../../repo/member';
 import type { MemberProgramRepo } from '../../../../repo/memberProgram';
 import type { OfferRepo } from '../../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../../repo/offerCatalog';
@@ -57,6 +58,7 @@ declare function processStartReserve4chevre(params: {
     eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     offer: OfferRepo;
     offerCatalog: OfferCatalogRepo;

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

@@ -8,6 +8,7 @@ import type { EventRepo } from '../../../repo/event';
 import type { EventOfferRepo } from '../../../repo/eventOffer';
 import { EventSeriesRepo } from '../../../repo/eventSeries';
 import type { IssuerRepo } from '../../../repo/issuer';
+import type { MemberRepo } from '../../../repo/member';
 import type { MemberProgramRepo } from '../../../repo/memberProgram';
 import type { OfferRepo } from '../../../repo/offer/unitPriceInCatalog';
 import type { OfferCatalogRepo } from '../../../repo/offerCatalog';
@@ -36,6 +37,7 @@ interface IAuthorizeRepos {
     eventOffer: EventOfferRepo;
     eventSeries: EventSeriesRepo;
     issuer: IssuerRepo;
+    member: MemberRepo;
     memberProgram: MemberProgramRepo;
     stockHolder: StockHolderRepo;
     offer: OfferRepo;

package/package.json

@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.1.0-alpha.5"
+  "version": "23.1.0-alpha.6"
 }