@chevre/domain 21.6.0 → 21.7.0-alpha.1

package/example/src/chevre/searchOffers.ts

@@ -1,37 +1,37 @@
 // tslint:disable:no-console
-// import * as redis from 'redis';
 import * as mongoose from 'mongoose';
 
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     const offers = await offerRepo.search({
-        // limit: 1,
+        limit: 1,
         // page: 1,
         project: { id: { $eq: String(process.env.PROJECT_ID) } },
-        additionalProperty: {
-            $all: [
-                {
-                    $elemMatch: {
-                        name: { $eq: 'theaterCode' },
-                        value: { $in: ['120'] }
-                    }
-                },
-                {
-                    $elemMatch: {
-                        name: { $eq: 'ticketCode' },
-                        value: { $in: ['10', '1001'] }
-                    }
-                }
-            ]
-        }
+        availability: { $eq: chevre.factory.itemAvailability.InStock }
+        // additionalProperty: {
+        //     $all: [
+        //         {
+        //             $elemMatch: {
+        //                 name: { $eq: 'theaterCode' },
+        //                 value: { $in: ['120'] }
+        //             }
+        //         },
+        //         {
+        //             $elemMatch: {
+        //                 name: { $eq: 'ticketCode' },
+        //                 value: { $in: ['10', '1001'] }
+        //             }
+        //         }
+        //     ]
+        // }
     });
     console.log(offers.map((offer) => {
-        return `${offer.additionalProperty?.find((p) => p.name === 'theaterCode')?.value} ${offer.additionalProperty?.find((p) => p.name === 'ticketCode')?.value}`;
+        return `${offer.project.id} ${offer.id} ${offer.identifier} ${offer.name.ja}`;
     }));
     console.log(offers.length);
 }

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,26 +6,20 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await eventRepo.unsetUnnecessaryFields({
-        filter: { 'offers.acceptedPaymentMethod': { $exists: true } },
-        $unset: { 'offers.acceptedPaymentMethod': 1 }
-    });
-    console.log('events unset', updateResult);
-
-    updateResult = await eventRepo.unsetUnnecessaryFields({
+    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
         filter: { 'offers.project': { $exists: true } },
         $unset: { 'offers.project': 1 }
     });
-    console.log('events unset', updateResult);
+    console.log('unset processed.', updateResult);
 
-    updateResult = await eventRepo.unsetUnnecessaryFields({
+    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
         filter: { 'offers.priceCurrency': { $exists: true } },
         $unset: { 'offers.priceCurrency': 1 }
     });
-    console.log('events unset', updateResult);
+    console.log('unset processed.', updateResult);
 }
 
 main()

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

@@ -55,4 +55,8 @@ export declare class MongoRepository {
         };
     }): Promise<void>;
     getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    unsetUnnecessaryFields(params: {
+        filter: any;
+        $unset: any;
+    }): Promise<import("mongodb").UpdateResult>;
 }

package/lib/chevre/repo/creativeWork.js

@@ -265,5 +265,11 @@ class MongoRepository {
             .sort({ identifier: factory.sortType.Ascending })
             .cursor();
     }
+    unsetUnnecessaryFields(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.creativeWorkModel.updateMany(params.filter, { $unset: params.$unset })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -67,6 +67,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     color?: any;
     validFrom?: Date | undefined;
     category?: any;
+    advanceBookingRequirement?: any;
     availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
@@ -97,6 +98,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     color?: any;
     validFrom?: Date | undefined;
     category?: any;
+    advanceBookingRequirement?: any;
     availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;
@@ -127,6 +129,7 @@ declare const schema: Schema<any, import("mongoose").Model<any, any, any, any, a
     color?: any;
     validFrom?: Date | undefined;
     category?: any;
+    advanceBookingRequirement?: any;
     availability?: string | undefined;
     hasMerchantReturnPolicy?: any;
     priceSpecification?: any;

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

@@ -18,6 +18,7 @@ const schema = new mongoose_1.Schema({
     category: mongoose_1.SchemaTypes.Mixed,
     color: mongoose_1.SchemaTypes.Mixed,
     additionalProperty: [mongoose_1.SchemaTypes.Mixed],
+    advanceBookingRequirement: mongoose_1.SchemaTypes.Mixed,
     alternateName: mongoose_1.SchemaTypes.Mixed,
     // acceptedPaymentMethod: SchemaTypes.Mixed, // 削除(2023-02-27~)
     addOn: [mongoose_1.SchemaTypes.Mixed],
@@ -207,3 +208,4 @@ schema.index({ validThrough: 1, 'priceSpecification.price': 1 }, {
         validThrough: { $exists: true }
     }
 });
+schema.index({ availability: 1, 'priceSpecification.price': 1 }, { name: 'searchByAvailability' });

package/lib/chevre/repo/offer.js

@@ -36,7 +36,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_OFFER_MONGO_CONDITIONS(params) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5, _6, _7, _8, _9, _10, _11, _12, _13, _14, _15, _16, _17, _18, _19, _20, _21, _22, _23, _24, _25, _26, _27, _28, _29, _30, _31, _32, _33;
         // MongoDB検索条件
         const andConditions = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
@@ -266,7 +266,11 @@ class MongoRepository {
                 });
             }
         }
-        const availableAtOrFromIdEq = (_23 = (_22 = params.availableAtOrFrom) === null || _22 === void 0 ? void 0 : _22.id) === null || _23 === void 0 ? void 0 : _23.$eq;
+        const availabilityEq = (_22 = params.availability) === null || _22 === void 0 ? void 0 : _22.$eq;
+        if (typeof availabilityEq === 'string') {
+            andConditions.push({ availability: { $eq: availabilityEq } });
+        }
+        const availableAtOrFromIdEq = (_24 = (_23 = params.availableAtOrFrom) === null || _23 === void 0 ? void 0 : _23.id) === null || _24 === void 0 ? void 0 : _24.$eq;
         if (typeof availableAtOrFromIdEq === 'string') {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -275,7 +279,7 @@ class MongoRepository {
                 }
             });
         }
-        const availableAtOrFromIdIn = (_25 = (_24 = params.availableAtOrFrom) === null || _24 === void 0 ? void 0 : _24.id) === null || _25 === void 0 ? void 0 : _25.$in;
+        const availableAtOrFromIdIn = (_26 = (_25 = params.availableAtOrFrom) === null || _25 === void 0 ? void 0 : _25.id) === null || _26 === void 0 ? void 0 : _26.$in;
         if (Array.isArray(availableAtOrFromIdIn)) {
             andConditions.push({
                 'availableAtOrFrom.id': {
@@ -284,7 +288,7 @@ class MongoRepository {
                 }
             });
         }
-        const addOnItemOfferedIdEq = (_28 = (_27 = (_26 = params.addOn) === null || _26 === void 0 ? void 0 : _26.itemOffered) === null || _27 === void 0 ? void 0 : _27.id) === null || _28 === void 0 ? void 0 : _28.$eq;
+        const addOnItemOfferedIdEq = (_29 = (_28 = (_27 = params.addOn) === null || _27 === void 0 ? void 0 : _27.itemOffered) === null || _28 === void 0 ? void 0 : _28.id) === null || _29 === void 0 ? void 0 : _29.$eq;
         if (typeof addOnItemOfferedIdEq === 'string') {
             andConditions.push({
                 'addOn.itemOffered.id': {
@@ -293,7 +297,7 @@ class MongoRepository {
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_30 = (_29 = params.hasMerchantReturnPolicy) === null || _29 === void 0 ? void 0 : _29.id) === null || _30 === void 0 ? void 0 : _30.$eq;
+        const hasMerchantReturnPolicyIdEq = (_31 = (_30 = params.hasMerchantReturnPolicy) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.id': {
@@ -302,7 +306,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_31 = params.additionalProperty) === null || _31 === void 0 ? void 0 : _31.$all;
+        const additionalPropertyAll = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -311,7 +315,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$elemMatch;
+        const additionalPropertyElemMatch = (_33 = params.additionalProperty) === null || _33 === void 0 ? void 0 : _33.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {

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

@@ -339,6 +339,14 @@ 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
+                });
+            }
             const programMembershipUsed = yield validateProgramMembershipUsed({
                 acceptedOffer,
                 project: params.transaction.project
@@ -484,6 +492,29 @@ function getAcceptedSeatNumbersAndSeatSections(params) {
         acceptedSeatSections
     };
 }
+/**
+ * 事前予約要件を検証する
+ */
+function validateAdvanceBookingRequirement(params) {
+    var _a, _b;
+    const advanceBookingRequirementMinValue = (_a = params.unitPriceOffer.advanceBookingRequirement) === null || _a === void 0 ? void 0 : _a.minValue;
+    const advanceBookingRequirementUnitCode = (_b = params.unitPriceOffer.advanceBookingRequirement) === null || _b === void 0 ? void 0 : _b.unitCode;
+    if (typeof advanceBookingRequirementMinValue === 'number' && typeof advanceBookingRequirementUnitCode === 'string') {
+        if (advanceBookingRequirementMinValue < 0) {
+            throw new factory.errors.NotImplemented('negative value as advanceBookingRequirement.minValue not implemented');
+        }
+        if (advanceBookingRequirementUnitCode !== factory.unitCode.Sec) {
+            throw new factory.errors.NotImplemented(`only ${factory.unitCode.Sec} implemented`);
+        }
+        const reservationForMustStartAfter = moment(params.now)
+            .add(advanceBookingRequirementMinValue, 'seconds');
+        const requirementSatisfied = moment(params.reservationFor.startDate)
+            .isSameOrAfter(reservationForMustStartAfter);
+        if (!requirementSatisfied) {
+            throw new factory.errors.Argument('acceptedOffer.id', 'advanceBookingRequirement not satisfied');
+        }
+    }
+}
 function validateProgramMembershipUsed(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;

package/lib/chevre/settings.d.ts

@@ -39,6 +39,7 @@ export declare const DEFAULT_TASKS_EXPORT_AGENT_NAME: string;
 export declare const USE_ASSET_TRANSACTION_SYNC_PROCESSING: boolean;
 export declare const USE_PAY_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 INFORM_RESERVATION_TASK_DELAY_IN_SECONDS: number;
 export declare const MONGO_MAX_TIME_MS: number;
 /**

package/lib/chevre/settings.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.settings = exports.MONGO_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 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_MAX_TIME_MS = exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = exports.USE_ADVANCE_BOOKING_REQUIREMENT = exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = exports.USE_PAY_ASSET_TRANSACTION_SYNC_PROCESSING = exports.USE_ASSET_TRANSACTION_SYNC_PROCESSING = exports.DEFAULT_TASKS_EXPORT_AGENT_NAME = exports.DEFAULT_PAYMENT_METHOD_TYPE_FOR_CREDIT_CARD = 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')
@@ -71,6 +71,7 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 // export const USE_NEW_STOCK_HOLDER_REPO_IDS: string[] = (typeof process.env.USE_NEW_STOCK_HOLDER_REPO_IDS === 'string')
 //     ? process.env.USE_NEW_STOCK_HOLDER_REPO_IDS.split(' ')
 //     : [];
+exports.USE_ADVANCE_BOOKING_REQUIREMENT = process.env.USE_ADVANCE_BOOKING_REQUIREMENT === '1';
 exports.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS = (typeof process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS === 'string')
     ? Number(process.env.INFORM_RESERVATION_TASK_DELAY_IN_SECONDS)
     : 0;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.324.0",
+    "@chevre/factory": "^4.325.0-alpha.1",
     "@cinerino/sdk": "3.163.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.6.0"
+  "version": "21.7.0-alpha.1"
 }