@chevre/domain 21.8.0-alpha.40 → 21.8.0-alpha.42

package/example/src/chevre/searchOffersByCatalog.ts

@@ -5,24 +5,24 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
     const offerRepo = new chevre.repository.Offer(mongoose.connection);
 
     const { offers } = await offerRepo.findOffersByOfferCatalogId({
         limit: 100,
         page: 1,
-        // ids: ['aldzf0vrk', 'xxx', '1001'],
+        // ids: ['al96nqj7z', 'xxx', '1001'],
         // ids: ['xx', 'xxx'],
         offerCatalog: {
-            id: 'bllroybre'
+            id: '0001'
             // id: 'xxx'
         },
         excludeAppliesToMovieTicket: false
+        // useOffersAsPrimary: true
     });
-    // console.log(offers);
     console.log(offers.map((offer) => {
-        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id}`;
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id} ${(<any>offer).offerIndex}`;
     }));
     console.log(offers.length);
     console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);

package/lib/chevre/emailMessageBuilder.js

@@ -107,7 +107,7 @@ function createEmailMessageAbout(params) {
     });
 }
 function createEmailMessageSender(params) {
-    var _a, _b, _c, _d;
+    var _a, _b;
     return {
         typeOf: params.order.seller.typeOf,
         name: (typeof ((_b = (_a = params.email) === null || _a === void 0 ? void 0 : _a.sender) === null || _b === void 0 ? void 0 : _b.name) === 'string')
@@ -115,10 +115,11 @@ function createEmailMessageSender(params) {
             : (typeof params.order.seller.name === 'string')
                 ? params.order.seller.name
                 : String(params.order.seller.id),
-        // sender.email指定を非推奨化(2023-08-23~)
-        email: (settings_1.USE_CUSTOM_SENDER_EMAIL && typeof ((_d = (_c = params.email) === null || _c === void 0 ? void 0 : _c.sender) === null || _d === void 0 ? void 0 : _d.email) === 'string')
-            ? params.email.sender.email
-            : settings_1.DEFAULT_SENDER_EMAIL
+        // sender.email指定を廃止(2023-09-07~)
+        // email: (USE_CUSTOM_SENDER_EMAIL && typeof params.email?.sender?.email === 'string')
+        //     ? params.email.sender.email
+        //     : DEFAULT_SENDER_EMAIL
+        email: settings_1.DEFAULT_SENDER_EMAIL
     };
 }
 /**

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

@@ -65,6 +65,10 @@ export declare class MongoRepository {
         limit?: number;
         page?: number;
         projection?: IProjection;
+        /**
+         * 強制的にoffersコレクションを使用する
+         */
+        useOffersAsPrimary?: boolean;
     }): Promise<{
         offers: factory.unitPriceOffer.IUnitPriceOffer[];
         sortedOfferIds: string[];

package/lib/chevre/repo/offer.js

@@ -834,7 +834,10 @@ class MongoRepository {
                     ? { sort: { identifier: factory.sortType.Ascending } }
                     : undefined), (typeof params.limit === 'number') ? { limit: params.limit } : undefined), (typeof params.page === 'number') ? { page: params.page } : undefined);
                 // USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG対応(2023-09-06~)
-                offers = yield this.search(searchOffersConditions, params.projection, settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG);
+                const useOffersAsPrimary = (params.useOffersAsPrimary === true)
+                    ? true
+                    : !settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG;
+                offers = yield this.search(searchOffersConditions, params.projection, useOffersAsPrimary);
                 // 完全廃止(基本的にsortedOfferIdsと合わせて利用する想定)(2023-09-04~)
                 // if (params.sort) {
                 //     // sorting

package/lib/chevre/settings.d.ts

@@ -40,7 +40,6 @@ 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_CUSTOM_SENDER_EMAIL: boolean;
 export declare const USE_ORDER_PAYMENT_DUE_ON_PLACED: boolean;
 export declare const USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY: boolean;
 export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY: boolean;

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.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = exports.USE_CUSTOM_SENDER_EMAIL = 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_MAX_TIME_MS = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG = exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = 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;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -72,7 +72,6 @@ exports.USE_NEW_EVENT_AVAILABILITY_KEY_FROM = (typeof process.env.USE_NEW_EVENT_
 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_CUSTOM_SENDER_EMAIL = process.env.USE_CUSTOM_SENDER_EMAIL === '1';
 exports.USE_ORDER_PAYMENT_DUE_ON_PLACED = process.env.USE_ORDER_PAYMENT_DUE_ON_PLACED === '1';
 exports.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY = process.env.USE_AUTHORIZE_PAYMENT_RESULT_AS_ARRAY === '1';
 exports.USE_AGGREGATE_OFFERS_AS_PRIMARY = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY === '1';

package/package.json

@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.8.0-alpha.40"
+  "version": "21.8.0-alpha.42"
 }