@chevre/domain 20.4.0-alpha.8 → 20.4.0

package/lib/chevre/service/permit.d.ts

@@ -30,6 +30,9 @@ export declare function activate(params: {
 }): (repos: {
     serviceOutput: ServiceOutputRepo;
 }) => Promise<factory.permit.IPermit>;
+declare type IPermitWithAccountDetail = Omit<factory.permit.IPermit, 'paymentAccount'> & {
+    paymentAccount?: factory.permit.IPaymentAccountWithDetail;
+};
 /**
  * プロジェクト指定で、許可証を検索する(ペイメントカードプロダクトの場合、口座詳細込み)
  */
@@ -38,4 +41,5 @@ export declare function search(project: {
 }, params: factory.product.IServiceOutputSearchConditions, projection?: any): (repos: {
     account: AccountRepo;
     serviceOutput: ServiceOutputRepo;
-}) => Promise<factory.permit.IPermit[]>;
+}) => Promise<IPermitWithAccountDetail[]>;
+export {};

package/lib/chevre/service/permit.js

@@ -78,33 +78,40 @@ exports.activate = activate;
 function search(project, params, projection) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
-        let serviceOutputs;
+        let permitsWithAccountDetail;
         // アウトプット検索条件のプロジェクトは強制的に上書き
         const searchConditions = Object.assign(Object.assign({}, params), { project: { id: { $eq: project.id } } });
         const productType = (_b = (_a = params.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === null || _b === void 0 ? void 0 : _b.$eq;
         switch (productType) {
             case factory.product.ProductType.PaymentCard:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                const permits = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = permits;
                 // 口座詳細取得
-                const accountNumbers = serviceOutputs.map((s) => { var _a; return (_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
-                    .filter((a) => typeof a === 'string');
+                const accountNumbers = permits.map((permit) => { var _a; return (_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber; })
+                    .filter((accountNumber) => typeof accountNumber === 'string');
                 if (accountNumbers.length > 0) {
                     const accounts = yield repos.account.search({
                         project: { id: { $eq: project.id } },
                         accountNumbers: accountNumbers
                     });
-                    serviceOutputs = serviceOutputs.map((s) => {
-                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = s.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
-                        return Object.assign(Object.assign({}, s), (account !== undefined)
-                            ? { paymentAccount: account }
-                            : undefined);
+                    permitsWithAccountDetail = permits.map((permit) => {
+                        const account = accounts.find((a) => { var _a; return a.accountNumber === ((_a = permit.paymentAccount) === null || _a === void 0 ? void 0 : _a.accountNumber); });
+                        const paymentAccount = (typeof (account === null || account === void 0 ? void 0 : account.typeOf) === 'string')
+                            ? {
+                                accountNumber: account.accountNumber,
+                                availableBalance: account.availableBalance,
+                                balance: account.balance,
+                                typeOf: account.typeOf
+                            }
+                            : undefined;
+                        return Object.assign(Object.assign({}, permit), { paymentAccount });
                     });
                 }
                 break;
             default:
-                serviceOutputs = yield repos.serviceOutput.search(searchConditions, projection);
+                permitsWithAccountDetail = (yield repos.serviceOutput.search(searchConditions, projection));
         }
-        return serviceOutputs;
+        return permitsWithAccountDetail;
     });
 }
 exports.search = search;

package/lib/chevre/service/reserve/potentialActions/onReservationUsed.js

@@ -28,37 +28,6 @@ function onReservationUsed(action, attendedReservation) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         const tasks = [];
         const now = new Date();
-        // INFORM_USE_RESERVATION_URL廃止(2023-01-30~)
-        // アクション通知タスク作成
-        // if (Array.isArray(informUseReservations)) {
-        //     informUseReservations.filter((informUseReservation) => {
-        //         return typeof informUseReservation.recipient?.url === 'string'
-        //             && informUseReservation.recipient.url.length > 0;
-        //     })
-        //         .forEach((informUseReservation) => {
-        //             const triggerWebhookTask: factory.task.triggerWebhook.IAttributes = {
-        //                 project: action.project,
-        //                 name: factory.taskName.TriggerWebhook,
-        //                 status: factory.taskStatus.Ready,
-        //                 runsAt: now,
-        //                 remainingNumberOfTries: 3,
-        //                 numberOfTried: 0,
-        //                 executionResults: [],
-        //                 data: {
-        //                     project: action.project,
-        //                     typeOf: factory.actionType.InformAction,
-        //                     agent: action.project,
-        //                     recipient: {
-        //                         typeOf: factory.personType.Person,
-        //                         id: String(informUseReservation.recipient?.url),
-        //                         url: String(informUseReservation.recipient?.url)
-        //                     },
-        //                     object: action
-        //                 }
-        //             };
-        //             tasks.push(triggerWebhookTask);
-        //         });
-        // }
         // inform galobally
         if (Array.isArray(informReservations)) {
             // やや遅延させる(確定通知が未達の可能性を考慮して)
@@ -100,29 +69,32 @@ function onReservationUsed(action, attendedReservation) {
                 };
             }));
         }
+        // projectを限定する(2023-02-21~)
         // 使用アクション集計タスクを作成する(冗長な作成を避ける)
-        const readyAggregateUseActionsTaskDoc = yield repos.task.taskModel.findOne({
-            'project.id': { $eq: action.project.id },
-            name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
-            status: { $eq: factory.taskStatus.Ready },
-            'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }
-        }, { _id: 1 })
-            .exec();
-        if (readyAggregateUseActionsTaskDoc === null) {
-            const aggregateUseActionsTask = {
-                project: attendedReservation.project,
-                name: factory.taskName.AggregateUseActionsOnEvent,
-                status: factory.taskStatus.Ready,
-                runsAt: now,
-                remainingNumberOfTries: 3,
-                numberOfTried: 0,
-                executionResults: [],
-                data: {
-                    typeOf: attendedReservation.reservationFor.typeOf,
-                    id: attendedReservation.reservationFor.id
-                }
-            };
-            tasks.push(aggregateUseActionsTask);
+        if (settings_1.settings.useAggregateEntranceGateProjects.includes(action.project.id)) {
+            const readyAggregateUseActionsTaskDoc = yield repos.task.taskModel.findOne({
+                'project.id': { $eq: action.project.id },
+                name: { $eq: factory.taskName.AggregateUseActionsOnEvent },
+                status: { $eq: factory.taskStatus.Ready },
+                'data.id': { $exists: true, $eq: attendedReservation.reservationFor.id }
+            }, { _id: 1 })
+                .exec();
+            if (readyAggregateUseActionsTaskDoc === null) {
+                const aggregateUseActionsTask = {
+                    project: attendedReservation.project,
+                    name: factory.taskName.AggregateUseActionsOnEvent,
+                    status: factory.taskStatus.Ready,
+                    runsAt: now,
+                    remainingNumberOfTries: 3,
+                    numberOfTried: 0,
+                    executionResults: [],
+                    data: {
+                        typeOf: attendedReservation.reservationFor.typeOf,
+                        id: attendedReservation.reservationFor.id
+                    }
+                };
+                tasks.push(aggregateUseActionsTask);
+            }
         }
         if (tasks.length > 0) {
             yield repos.task.saveMany(tasks);

package/lib/chevre/service/task/aggregateScreeningEvent.js

@@ -14,6 +14,7 @@ const factory = require("../../factory");
 const event_1 = require("../../repo/event");
 const screeningEvent_1 = require("../../repo/itemAvailability/screeningEvent");
 const offer_1 = require("../../repo/offer");
+const offerCatalog_1 = require("../../repo/offerCatalog");
 const place_1 = require("../../repo/place");
 const product_1 = require("../../repo/product");
 const project_1 = require("../../repo/project");
@@ -33,6 +34,7 @@ function call(data) {
             event: new event_1.MongoRepository(settings.connection),
             eventAvailability: new screeningEvent_1.RedisRepository(settings.redisClient),
             offer: new offer_1.MongoRepository(settings.connection),
+            offerCatalog: new offerCatalog_1.MongoRepository(settings.connection),
             offerRateLimit: new offer_2.RedisRepository(settings.redisClient),
             place: new place_1.MongoRepository(settings.connection),
             product: new product_1.MongoRepository(settings.connection),

package/lib/chevre/service/transaction/moneyTransfer.js

@@ -328,7 +328,6 @@ function processMoneyTransferTransaction(params) {
                     toLocation,
                     pendingTransaction: {
                         typeOf: factory.account.transactionType.Transfer,
-                        id: '',
                         transactionNumber: params.transactionNumber
                     },
                     force: false

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -213,12 +213,12 @@ function processAuthorizeProductOffer(params) {
         };
         // オファーにポイント特典設定があるかどうか確認
         let pointAward;
-        const offers = yield OfferService.product.search({
+        const { offers } = yield OfferService.product.search({
             project: { id: params.project.id },
             itemOffered: { id: params.product.id },
             seller: { id: String(seller.id) },
             onlyValid: true,
-            sort: false // ソート不要(2023-01-27~)
+            addSortIndex: false
         })(repos);
         const acceptedProductOffer = offers.find((o) => o.identifier === acceptedOffer.identifier);
         if (acceptedProductOffer === undefined) {
@@ -245,18 +245,17 @@ function processAuthorizeProductOffer(params) {
             }
             pointAward = {
                 typeOf: factory.actionType.MoneyTransfer,
-                // Permit識別子を指定する
                 toLocation: {
                     identifier: String(toPermit.identifier),
-                    // 発行サービス指定
-                    issuedThrough: { id: toLocationIssuedThroughId }
+                    issuedThrough: { id: toLocationIssuedThroughId },
+                    typeOf: factory.permit.PermitType.Permit
                 },
                 recipient: {
                     id: customer.id,
                     name: `${customer.givenName} ${customer.familyName}`,
                     typeOf: customer.typeOf
                 },
-                // ポイント特典識別子を指定(ユニークネスを保証するため)
+                // 特典識別子を指定(ユニークネスを保証するため)
                 purpose: { identifier }
             };
         }

package/lib/chevre/settings.d.ts

@@ -21,6 +21,10 @@ export declare type ISettings = factory.project.ISettings & {
     userPoolIdOld: string;
     userPoolIdNew: string;
     maxNumCreditCardPaymentMethod?: number;
+    useAggregateEntranceGateProjects: string[];
+    useAggregateOfferProjects: string[];
+    useOfferRateLimitProjects: string[];
+    useCheckMovieTicketBeforePay: boolean;
 };
 export declare const DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;

package/lib/chevre/settings.js

@@ -54,7 +54,7 @@ exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_PAY_ASSET_TR
 /**
  * グローバル設定
  */
-exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
+exports.settings = Object.assign(Object.assign({ transactionWebhookUrls, onOrderStatusChanged: {
         informOrder: informOrderUrls
             .filter((url) => url.length > 0)
             .map((url) => {
@@ -94,4 +94,10 @@ exports.settings = Object.assign({ transactionWebhookUrls, onOrderStatusChanged:
         timeout: triggerWebhookTimeout
     }, maximumReservationGracePeriodInDays: MAXIMUM_RESERVATION_GRACE_PERIOD_IN_DAYS, userPoolIdOld: String(process.env.USERPOOL_ID_OLD), userPoolIdNew: String(process.env.USERPOOL_ID_NEW) }, (typeof MAX_NUM_CREDIT_CARD_PAYMENT_METHOD === 'number')
     ? { maxNumCreditCardPaymentMethod: MAX_NUM_CREDIT_CARD_PAYMENT_METHOD }
-    : undefined);
+    : undefined), { useAggregateEntranceGateProjects: (typeof process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS === 'string')
+        ? process.env.USE_AGGREGATE_ENTRANCE_GATE_PROJECTS.split(',')
+        : [], useAggregateOfferProjects: (typeof process.env.USE_AGGREGATE_OFFER_PROJECTS === 'string')
+        ? process.env.USE_AGGREGATE_OFFER_PROJECTS.split(',')
+        : [], useOfferRateLimitProjects: (typeof process.env.USE_OFFER_RATE_LIMIT_PROJECTS === 'string')
+        ? process.env.USE_OFFER_RATE_LIMIT_PROJECTS.split(',')
+        : [], useCheckMovieTicketBeforePay: process.env.USE_CHECK_MOVIE_TICKET_BEFORE_PAY === '1' });

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.289.0-alpha.7",
-    "@cinerino/sdk": "3.140.0-alpha.9",
+    "@chevre/factory": "4.295.0",
+    "@cinerino/sdk": "3.144.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.4.0-alpha.8"
+  "version": "20.4.0"
 }

package/example/src/chevre/migrateAccountTitleAdditionalProperties.ts

@@ -1,157 +0,0 @@
-// tslint:disable:no-console
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const accountTitleRepo = new chevre.repository.AccountTitle(mongoose.connection);
-
-    const cursor = accountTitleRepo.getCursor(
-        {
-            // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID }
-            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
-            // starDate: { $gte: new Date() }
-            // _id: { $eq: 'al6aff83w' }
-        },
-        {
-            // _id: 1,
-        }
-    );
-    console.log('accountTitles found');
-
-    const additionalPropertyNamesOnCategories: string[] = [];
-    const additionalPropertyNames: string[] = [];
-    const additionalPropertyNamesOnTitles: string[] = [];
-    const projectIdsOnCategories: string[] = [];
-    const projectIds: string[] = [];
-    const projectIdsOnTitles: string[] = [];
-    const unexpextedprojectIdsOnCategories: string[] = [];
-    const unexpextedprojectIds: string[] = [];
-    const unexpextedprojectIdsOnTitles: string[] = [];
-
-    let i = 0;
-    let updateCount = 0;
-    // tslint:disable-next-line:max-func-body-length
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const accountTitleCategory: chevre.factory.accountTitle.IAccountTitle = doc.toObject();
-
-        const additionalPropertyNamesOnCategory = accountTitleCategory.additionalProperty?.map((p) => p.name);
-        console.log(
-            (Array.isArray(additionalPropertyNamesOnCategory)) ? additionalPropertyNamesOnCategory.length : 0,
-            'additionalPropertyNamesOnCategory found',
-            accountTitleCategory.project.id,
-            accountTitleCategory.codeValue
-        );
-        if (Array.isArray(additionalPropertyNamesOnCategory) && additionalPropertyNamesOnCategory.length > 0) {
-            console.log(
-                additionalPropertyNamesOnCategory.length,
-                'additionalPropertyNamesOnResource found',
-                accountTitleCategory.project.id,
-                accountTitleCategory.codeValue
-            );
-            additionalPropertyNamesOnCategories.push(...additionalPropertyNamesOnCategory);
-            projectIdsOnCategories.push(accountTitleCategory.project.id);
-            additionalPropertyNamesOnCategory.forEach((name) => {
-                if (!name.match(/^[a-zA-Z]*$/)) {
-                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIdsOnCategories.push(accountTitleCategory.project.id);
-                }
-                // tslint:disable-next-line:no-magic-numbers
-                if (name.length < 5) {
-                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIdsOnCategories.push(accountTitleCategory.project.id);
-                }
-            });
-        }
-
-        if (Array.isArray(accountTitleCategory.hasCategoryCode)) {
-            accountTitleCategory.hasCategoryCode.forEach((accountTitleSet) => {
-                const additionalPropertyNamesOnResource = accountTitleSet.additionalProperty?.map((p) => p.name);
-                console.log(
-                    (Array.isArray(additionalPropertyNamesOnResource)) ? additionalPropertyNamesOnResource.length : 0,
-                    'additionalPropertyNamesOnResource found',
-                    accountTitleCategory.project.id,
-                    accountTitleCategory.codeValue
-                );
-                if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
-                    console.log(
-                        additionalPropertyNamesOnResource.length,
-                        'additionalPropertyNamesOnResource found',
-                        accountTitleCategory.project.id,
-                        accountTitleCategory.codeValue
-                    );
-                    additionalPropertyNames.push(...additionalPropertyNamesOnResource);
-                    projectIds.push(accountTitleCategory.project.id);
-                    additionalPropertyNamesOnResource.forEach((name) => {
-                        if (!name.match(/^[a-zA-Z]*$/)) {
-                            // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                            unexpextedprojectIds.push(accountTitleCategory.project.id);
-                        }
-                        // tslint:disable-next-line:no-magic-numbers
-                        if (name.length < 5) {
-                            // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                            unexpextedprojectIds.push(accountTitleCategory.project.id);
-                        }
-                    });
-                }
-
-                if (Array.isArray(accountTitleSet.hasCategoryCode)) {
-                    accountTitleSet.hasCategoryCode.forEach((accountTitl) => {
-                        const additionalPropertyNamesOnSection = accountTitl.additionalProperty?.map((p) => p.name);
-                        console.log(
-                            (Array.isArray(additionalPropertyNamesOnSection)) ? additionalPropertyNamesOnSection.length : 0,
-                            'additionalPropertyNamesOnSection found',
-                            accountTitleCategory.project.id,
-                            accountTitleCategory.codeValue
-                        );
-                        if (Array.isArray(additionalPropertyNamesOnSection) && additionalPropertyNamesOnSection.length > 0) {
-                            console.log(
-                                additionalPropertyNamesOnSection.length,
-                                'additionalPropertyNamesOnSection found',
-                                accountTitleCategory.project.id,
-                                accountTitleCategory.codeValue
-                            );
-                            additionalPropertyNamesOnTitles.push(...additionalPropertyNamesOnSection);
-                            projectIdsOnTitles.push(accountTitleCategory.project.id);
-                            additionalPropertyNamesOnSection.forEach((name) => {
-                                if (!name.match(/^[a-zA-Z]*$/)) {
-                                    // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                                    unexpextedprojectIdsOnTitles.push(accountTitleCategory.project.id);
-                                }
-                                // tslint:disable-next-line:no-magic-numbers
-                                if (name.length < 5) {
-                                    // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                                    unexpextedprojectIdsOnTitles.push(accountTitleCategory.project.id);
-                                }
-                            });
-                        }
-                    });
-                }
-            });
-        }
-    });
-    console.log(i, 'places checked');
-    console.log(updateCount, 'places updated');
-    console.log([...new Set(additionalPropertyNamesOnCategories)], 'categories');
-    console.log([...new Set(projectIdsOnCategories)], 'categories');
-    console.log([...new Set(unexpextedprojectIdsOnCategories)], 'categories');
-    console.log([...new Set(additionalPropertyNames)], 'sets');
-    console.log([...new Set(projectIds)], 'sets');
-    console.log([...new Set(unexpextedprojectIds)], 'sets');
-    console.log([...new Set(additionalPropertyNamesOnTitles)], 'titles');
-    console.log([...new Set(projectIdsOnTitles)], 'titles');
-    console.log([...new Set(unexpextedprojectIdsOnTitles)], 'titles');
-}
-
-main()
-    .then()
-    .catch(console.error);

package/lib/chevre/service/assetTransaction/pay/movieTicket/validation.d.ts

@@ -1,14 +0,0 @@
-/**
- * 決済取引サービス
- */
-import * as factory from '../../../../factory';
-import { MongoRepository as EventRepo } from '../../../../repo/event';
-import { MongoRepository as ProductRepo } from '../../../../repo/product';
-import { MongoRepository as ProjectRepo } from '../../../../repo/project';
-import { MongoRepository as SellerRepo } from '../../../../repo/seller';
-export declare function validateMovieTicket(params: factory.assetTransaction.pay.IStartParamsWithoutDetail, paymentServiceId: string): (repos: {
-    event: EventRepo;
-    product: ProductRepo;
-    project: ProjectRepo;
-    seller: SellerRepo;
-}) => Promise<import("../../../payment/movieTicket").ICheckResult>;

package/lib/chevre/service/task/deleteAuthorization.d.ts

@@ -1,6 +0,0 @@
-import { IOperation } from '../task';
-import * as factory from '../../factory';
-/**
- * タスク実行関数
- */
-export declare function call(data: factory.task.IData<factory.taskName.DeleteAuthorization>): IOperation<void>;

package/lib/chevre/service/task/deleteAuthorization.js

@@ -1,29 +0,0 @@
-"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.call = void 0;
-const action_1 = require("../../repo/action");
-const code_1 = require("../../repo/code");
-const CodeService = require("../code");
-/**
- * タスク実行関数
- */
-function call(data) {
-    return (settings) => __awaiter(this, void 0, void 0, function* () {
-        const actionRepo = new action_1.MongoRepository(settings.connection);
-        const authorizationRepoRepo = new code_1.MongoRepository(settings.connection);
-        yield CodeService.deleteAuthorization(data)({
-            action: actionRepo,
-            authorization: authorizationRepoRepo
-        });
-    });
-}
-exports.call = call;