@chevre/domain 21.12.0-alpha.0 → 21.13.0-alpha.0

package/lib/chevre/repo/permit.js

@@ -17,7 +17,7 @@ const factory = require("../factory");
  */
 class MongoRepository {
     constructor(connection) {
-        this.serviceOutputModel = connection.model(serviceOutput_1.modelName, serviceOutput_1.schema);
+        this.serviceOutputModel = connection.model(serviceOutput_1.modelName, (0, serviceOutput_1.createSchema)());
     }
     findByIdentifier(params, projection) {
         var _a, _b;

package/lib/chevre/repo/place/hasPOS.js

@@ -19,7 +19,7 @@ const settings_1 = require("../../settings");
  */
 class MongoRepository {
     constructor(connection, operater) {
-        this.placeModel = connection.model(place_1.modelName, place_1.schema);
+        this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
         this.operator = operater;
     }
     search(params) {

package/lib/chevre/repo/place.js

@@ -30,7 +30,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.placeModel = connection.model(place_1.modelName, place_1.schema);
+        this.placeModel = connection.model(place_1.modelName, (0, place_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_BUS_STOP_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/priceSpecification.js

@@ -29,7 +29,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.priceSpecificationModel = connection.model(priceSpecification_1.modelName, priceSpecification_1.schema);
+        this.priceSpecificationModel = connection.model(priceSpecification_1.modelName, (0, priceSpecification_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/product.js

@@ -29,7 +29,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.productModel = connection.model(product_1.modelName, product_1.schema);
+        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/productOffer.js

@@ -19,7 +19,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.productModel = connection.model(product_1.modelName, product_1.schema);
+        this.productModel = connection.model(product_1.modelName, (0, product_1.createSchema)());
     }
     /**
      * プロダクトオファー検索

package/lib/chevre/repo/project.js

@@ -18,7 +18,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.projectModel = connection.model(project_1.modelName, project_1.schema);
+        this.projectModel = connection.model(project_1.modelName, (0, project_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
         // MongoDB検索条件

package/lib/chevre/repo/reservation.js

@@ -18,7 +18,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.reservationModel = connection.model(reservation_1.modelName, reservation_1.schema);
+        this.reservationModel = connection.model(reservation_1.modelName, (0, reservation_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/role.js

@@ -21,7 +21,7 @@ var RoleType;
  */
 class MongoRepository {
     constructor(connection) {
-        this.roleModel = connection.model(role_1.modelName, role_1.schema);
+        this.roleModel = connection.model(role_1.modelName, (0, role_1.createSchema)());
     }
     static CREATE_MONGO_CONDITIONS(params) {
         var _a, _b, _c;

package/lib/chevre/repo/seller.js

@@ -30,7 +30,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.organizationModel = connection.model(seller_1.modelName, seller_1.schema);
+        this.organizationModel = connection.model(seller_1.modelName, (0, seller_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/serviceOutput.js

@@ -18,7 +18,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.serviceOutputModel = connection.model(serviceOutput_1.modelName, serviceOutput_1.schema);
+        this.serviceOutputModel = connection.model(serviceOutput_1.modelName, (0, serviceOutput_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/task.js

@@ -27,7 +27,7 @@ const sortOrder4executionOfTasks = {
  */
 class MongoRepository {
     constructor(connection) {
-        this.taskModel = connection.model(task_1.modelName, task_1.schema);
+        this.taskModel = connection.model(task_1.modelName, (0, task_1.createSchema)());
     }
     // tslint:disable-next-line:max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/telemetry.js

@@ -7,7 +7,7 @@ const telemetry_1 = require("./mongoose/schemas/telemetry");
  */
 class MongoRepository {
     constructor(connection) {
-        this.telemetryModel = connection.model(telemetry_1.modelName, telemetry_1.schema);
+        this.telemetryModel = connection.model(telemetry_1.modelName, (0, telemetry_1.createSchema)());
     }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repo/transaction.js

@@ -20,7 +20,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.transactionModel = connection.model(transaction_1.modelName, transaction_1.schema);
+        this.transactionModel = connection.model(transaction_1.modelName, (0, transaction_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(params) {

package/lib/chevre/repo/trip.js

@@ -29,7 +29,7 @@ const settings_1 = require("../settings");
  */
 class MongoRepository {
     constructor(connection) {
-        this.tripModel = connection.model(trip_1.modelName, trip_1.schema);
+        this.tripModel = connection.model(trip_1.modelName, (0, trip_1.createSchema)());
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_MONGO_CONDITIONS(conditions) {

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

@@ -342,14 +342,12 @@ function createReservations4transactionObject(params) {
             if (ticketType === undefined) {
                 throw new factory.errors.NotFound(ticketOffer.typeOf);
             }
-            if (settings_1.USE_ADVANCE_BOOKING_REQUIREMENT) {
-                // 事前予約要件検証(2023-08-10~)
-                validateAdvanceBookingRequirement({
-                    unitPriceOffer: ticketType,
-                    now: params.now,
-                    reservationFor: params.event
-                });
-            }
+            // 事前予約要件検証(2023-08-10~)
+            validateAdvanceBookingRequirement({
+                unitPriceOffer: ticketType,
+                now: params.now,
+                reservationFor: params.event
+            });
             const programMembershipUsed = yield validateProgramMembershipUsed({
                 acceptedOffer,
                 project: params.transaction.project

package/lib/chevre/settings.d.ts

@@ -37,7 +37,6 @@ export type ISettings = factory.project.ISettings & {
 export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_NEW_EVENT_AVAILABILITY_KEY_FROM: moment.Moment;
-export declare const USE_ADVANCE_BOOKING_REQUIREMENT: boolean;
 export declare const USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT: boolean;
 export declare const USE_DELETE_EVENT_BY_ORDER: boolean;
 export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
@@ -45,6 +44,7 @@ export declare const USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY: boolean;
 export declare const USE_OPTIMIZE_TICKET_OFFER: boolean;
 export declare const MONGO_MAX_TIME_MS: number;
 export declare const MONGO_READ_PREFERENCE: string;
+export declare const MONGO_AUTO_INDEX: boolean;
 /**
  * グローバル設定
  */

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
+exports.settings = exports.MONGO_AUTO_INDEX = exports.MONGO_READ_PREFERENCE = exports.MONGO_MAX_TIME_MS = exports.USE_OPTIMIZE_TICKET_OFFER = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_DELETE_EVENT_BY_ORDER = exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_SENDER_EMAIL = exports.TRANSACTION_CANCELED_STORAGE_PERIOD_IN_DAYS = exports.TRANSACTION_CONFIRMED_STORAGE_PERIOD_IN_DAYS = exports.ASSET_TRANSACTION_STORAGE_PERIOD_IN_DAYS = exports.ABORTED_TASKS_WITHOUT_REPORT = exports.TRIGGER_WEBHOOK_RETRY_INTERVAL_IN_MS = exports.TRIGGER_WEBHOOK_MAX_RETRY_COUNT = void 0;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -63,7 +63,6 @@ exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = process.env.USE_ASSET_TRANSACTIO
 exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM === 'string')
     ? moment(process.env.USE_NEW_EVENT_AVAILABILITY_KEY_FROM)
     : moment('2023-08-31T15:00:00Z');
-exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
 exports.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT = process.env.USE_OBJECT_AS_PAY_TRANSACTION_AMOUNT === '1';
 exports.USE_DELETE_EVENT_BY_ORDER = process.env.USE_DELETE_EVENT_BY_ORDER === '1';
 exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
@@ -76,6 +75,7 @@ exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
 exports.MONGO_READ_PREFERENCE = (typeof process.env.MONGO_READ_PREFERENCE === 'string')
     ? process.env.MONGO_READ_PREFERENCE
     : 'primaryPreferred';
+exports.MONGO_AUTO_INDEX = process.env.MONGO_AUTO_INDEX === '1';
 /**
  * グローバル設定
  */

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@chevre/factory": "4.334.0",
-    "@cinerino/sdk": "3.170.0",
+    "@cinerino/sdk": "3.172.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -24,7 +24,6 @@
     "jsonwebtoken": "9.0.0",
     "lodash.difference": "^4.5.0",
     "moment": "^2.29.1",
-    "moment-range": "^4.0.2",
     "moment-timezone": "^0.5.33",
     "node-fpe": "1.0.0",
     "pug": "^2.0.4",
@@ -82,7 +81,6 @@
     "npm": ">=6.0.0"
   },
   "keywords": [],
-  "license": "ISC",
   "main": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "files": [
@@ -117,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.12.0-alpha.0"
+  "version": "21.13.0-alpha.0"
 }

package/example/src/chevre/transaction/findCreditCard.ts

@@ -1,31 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-import { findCreditCard } from '../../../../lib/chevre/service/transaction/orderProgramMembership/findCreditCard';
-
-const project = { id: String(process.env.PROJECT_ID) };
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const projectRepo = new chevre.repository.Project(mongoose.connection);
-    const productRepo = new chevre.repository.Product(mongoose.connection);
-    const personRepo = new chevre.repository.Person({ userPoolId: chevre.settings.settings.userPoolIdNew });
-
-    const result = await findCreditCard({
-        project: { id: project.id },
-        customer: { id: 'a7909268-a584-425e-8212-d7d10f344093' },
-        // iss: '',
-        paymentMethodType: 'CreditCard'
-    })({
-        product: productRepo,
-        person: personRepo,
-        project: projectRepo
-    });
-    console.log(result);
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);

package/lib/chevre/service/transaction/orderProgramMembership/findCreditCard.d.ts

@@ -1,23 +0,0 @@
-/**
- * findCreditCard
- */
-import * as GMO from '@motionpicture/gmo-service';
-import { CognitoRepository as PersonRepo } from '../../../repo/person';
-import { MongoRepository as ProductRepo } from '../../../repo/product';
-import { MongoRepository as ProjectRepo } from '../../../repo/project';
-/**
- * 所有クレジットカード検索
- */
-export declare function findCreditCard(params: {
-    project: {
-        id: string;
-    };
-    customer: {
-        id: string;
-    };
-    paymentMethodType: string;
-}): (repos: {
-    project: ProjectRepo;
-    person: PersonRepo;
-    product: ProductRepo;
-}) => Promise<GMO.factory.card.ISearchCardResult>;

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

@@ -1,136 +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.findCreditCard = void 0;
-/**
- * findCreditCard
- */
-const GMO = require("@motionpicture/gmo-service");
-const createDebug = require("debug");
-const creditCard_1 = require("../../../repo/paymentMethod/creditCard");
-const person_1 = require("../../../repo/person");
-const factory = require("../../../factory");
-const credentials_1 = require("../../../credentials");
-const settings_1 = require("../../../settings");
-const debug = createDebug('chevre-domain:orderProgramMembership');
-/**
- * 所有クレジットカード検索
- */
-function findCreditCard(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 会員クレジットカード検索
-        // const creditCards = await repos.creditCard.searchCreditCards({ id: params.customer.id, iss: params.iss });
-        // // creditCards = creditCards.filter((c) => c.defaultFlag === '1');
-        // const creditCard = creditCards.shift();
-        // if (creditCard === undefined) {
-        //     throw new factory.errors.NotFound('CreditCard');
-        // }
-        var _a;
-        const project = yield repos.project.findById({
-            id: params.project.id,
-            inclusion: ['settings'],
-            exclusion: []
-        });
-        // const userPoolId: string = params.iss;
-        // checkUseMyCreditCards(project);
-        let memberId = params.customer.id;
-        const useUsernameAsGMOMemberId = ((_a = project.settings) === null || _a === void 0 ? void 0 : _a.useUsernameAsGMOMemberId) === true;
-        debug('useUsernameAsGMOMemberId:', useUsernameAsGMOMemberId);
-        if (useUsernameAsGMOMemberId) {
-            const person = yield repos.person.findById({ userId: params.customer.id });
-            memberId = yield person2username(person);
-        }
-        const creditCardPaymentCredentials = yield getCreditCardPaymentServiceChannel({
-            project: { id: params.project.id },
-            paymentMethodType: params.paymentMethodType
-        })(repos);
-        const creditCardRepo = new creditCard_1.GMORepository({
-            siteId: creditCardPaymentCredentials.siteId,
-            sitePass: creditCardPaymentCredentials.sitePass,
-            cardService: new GMO.service.Card({ endpoint: creditCardPaymentCredentials.endpoint }, { timeout: credentials_1.credentials.gmo.timeout })
-        });
-        const searchCardResults = yield creditCardRepo.search({ personId: memberId });
-        const creditCard = searchCardResults.shift();
-        if (creditCard === undefined) {
-            throw new factory.errors.NotFound('CreditCard');
-        }
-        return creditCard;
-    });
-}
-exports.findCreditCard = findCreditCard;
-const SSKTS_PROVIDER_NAME = 'SSKTS';
-function person2username(person) {
-    var _a, _b, _c, _d;
-    return __awaiter(this, void 0, void 0, function* () {
-        let username = (_a = person.memberOf) === null || _a === void 0 ? void 0 : _a.membershipNumber;
-        // ユーザープールが本家の場合とsskstの場合に対応
-        // 本家にssktsをプロバイダーとしてログインしている場合、追加特性に以下のような値のidentitiesがあるはず
-        // [{"userId":"xxxx","providerName":"SSKTS","providerType":"OIDC"}]
-        const userIdentitiesStr = (_c = (_b = person.additionalProperty) === null || _b === void 0 ? void 0 : _b.find((p) => p.name === 'identities')) === null || _c === void 0 ? void 0 : _c.value;
-        if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
-            debug('userIdentitiesStr:', userIdentitiesStr);
-            try {
-                const identities = JSON.parse(userIdentitiesStr);
-                if (Array.isArray(identities) && identities.length > 0) {
-                    const providerName = identities[0].providerName;
-                    const userIdByIdentities = identities[0].userId;
-                    if (providerName === SSKTS_PROVIDER_NAME) {
-                        if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
-                            const personRepo = new person_1.CognitoRepository({
-                                userPoolId: settings_1.settings.userPoolIdOld
-                            });
-                            // oldUserは必ず存在するはず
-                            const oldUser = yield personRepo.findById({ userId: userIdByIdentities });
-                            username = String((_d = oldUser.memberOf) === null || _d === void 0 ? void 0 : _d.membershipNumber);
-                            debug('oldUser found. username:', username);
-                        }
-                    }
-                }
-            }
-            catch (error) {
-                throw error;
-            }
-        }
-        return username;
-    });
-}
-function getCreditCardPaymentServiceChannel(params) {
-    return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const paymentServices = yield repos.product.search({
-            limit: 1,
-            project: { id: { $eq: params.project.id } },
-            typeOf: { $eq: factory.service.paymentService.PaymentServiceType.CreditCard },
-            serviceType: { codeValue: { $eq: params.paymentMethodType } }
-        }, [], []);
-        const paymentServiceSetting = paymentServices.shift();
-        if (paymentServiceSetting === undefined) {
-            throw new factory.errors.NotFound('PaymentService');
-        }
-        // IDで検索いないとavailableChannelを取得できない
-        const paymentService = yield repos.product.findById({ id: String(paymentServiceSetting.id) }, ['availableChannel'], []);
-        const availableChannel = paymentService === null || paymentService === void 0 ? void 0 : paymentService.availableChannel;
-        if (typeof (availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.serviceUrl) !== 'string') {
-            throw new factory.errors.NotFound('paymentService.availableChannel.serviceUrl');
-        }
-        if (typeof ((_a = availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.credentials) === null || _a === void 0 ? void 0 : _a.siteId) !== 'string') {
-            throw new factory.errors.NotFound('paymentService.availableChannel.credentials.siteId');
-        }
-        if (typeof ((_b = availableChannel === null || availableChannel === void 0 ? void 0 : availableChannel.credentials) === null || _b === void 0 ? void 0 : _b.sitePass) !== 'string') {
-            throw new factory.errors.NotFound('paymentService.availableChannel.credentials.sitePass');
-        }
-        return {
-            endpoint: availableChannel.serviceUrl,
-            siteId: availableChannel.credentials.siteId,
-            sitePass: availableChannel.credentials.sitePass
-        };
-    });
-}