@chevre/domain 21.8.0-alpha.34 → 21.8.0-alpha.36

package/example/src/chevre/searchOffersFromAggregateOffer.ts

@@ -11,9 +11,12 @@ async function main() {
 
     const offers = await offerRepo.search(
         {
-            limit: 5,
+            limit: 10,
             page: 1,
-            sort: { 'priceSpecification.price': 1 },
+            sort: {
+                'priceSpecification.price': 1,
+                identifier: 1
+            },
             project: { id: { $eq: String(process.env.PROJECT_ID) } },
             availability: { $eq: chevre.factory.itemAvailability.InStock },
             itemOffered: {
@@ -101,8 +104,8 @@ async function main() {
                     }
                 },
                 price: {
-                    // $gte: 100,
-                    // $lte: 500
+                    // $gte: 2000,
+                    // $lte: 2000
                 },
                 referenceQuantity: {
                     value: {
@@ -147,14 +150,16 @@ async function main() {
             identifier: 1,
             name: 1,
             alternateName: 1,
-            priceSpecification: 1
+            priceSpecification: 1,
+            project: 1
         }
     );
     console.log(offers);
     console.log(offers.map((offer) => {
-        return `${offer.project?.id} ${offer.id} ${offer.identifier} ${offer.name?.ja} ${offer.priceSpecification?.price}`;
+        return `${offer.project?.id} ${offer.identifier} ${offer.priceSpecification?.price} ${offer.name?.ja} ${offer.id}`;
     }));
     console.log(offers.length);
+    console.log('USE_AGGREGATE_OFFERS_AS_PRIMARY:', process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY);
 }
 
 main()

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

@@ -26,9 +26,10 @@ import { BulkWriteResult as BulkWriteOpResultObject } from 'mongodb';
 import { AnyExpression, Connection, PipelineStage } from 'mongoose';
 import * as factory from '../factory';
 type IMatchStage = PipelineStage.Match;
-interface IProjection {
-    [key: string]: 0 | 1;
-}
+type KeyOfUnitPriceOffer = keyof factory.unitPriceOffer.IUnitPriceOffer;
+type IProjection = {
+    [key in KeyOfUnitPriceOffer]?: 0 | 1;
+};
 /**
  * オファーリポジトリ
  */

package/lib/chevre/repo/offer.js

@@ -48,7 +48,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, _33;
+        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, _34, _35, _36;
         // 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;
@@ -303,13 +303,16 @@ class MongoRepository {
         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': {
-                    $exists: true,
-                    $eq: addOnItemOfferedIdEq
-                }
+                'addOn.itemOffered.id': { $exists: true, $eq: addOnItemOfferedIdEq }
+            });
+        }
+        const addOnItemOfferedIdIn = (_32 = (_31 = (_30 = params.addOn) === null || _30 === void 0 ? void 0 : _30.itemOffered) === null || _31 === void 0 ? void 0 : _31.id) === null || _32 === void 0 ? void 0 : _32.$in;
+        if (Array.isArray(addOnItemOfferedIdIn)) {
+            andConditions.push({
+                'addOn.itemOffered.id': { $exists: true, $in: addOnItemOfferedIdIn }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_31 = (_30 = params.hasMerchantReturnPolicy) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
+        const hasMerchantReturnPolicyIdEq = (_34 = (_33 = params.hasMerchantReturnPolicy) === null || _33 === void 0 ? void 0 : _33.id) === null || _34 === void 0 ? void 0 : _34.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             andConditions.push({
                 'hasMerchantReturnPolicy.id': {
@@ -318,7 +321,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$all;
+        const additionalPropertyAll = (_35 = params.additionalProperty) === null || _35 === void 0 ? void 0 : _35.$all;
         if (Array.isArray(additionalPropertyAll)) {
             andConditions.push({
                 additionalProperty: {
@@ -327,7 +330,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_33 = params.additionalProperty) === null || _33 === void 0 ? void 0 : _33.$elemMatch;
+        const additionalPropertyElemMatch = (_36 = params.additionalProperty) === null || _36 === void 0 ? void 0 : _36.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             andConditions.push({
                 additionalProperty: {
@@ -354,7 +357,7 @@ class MongoRepository {
     }
     // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     static CREATE_AGGREGATE_OFFERS_MATCH_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, _33;
+        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, _34, _35, _36;
         const matchStages = [];
         const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
         if (typeof projectIdEq === 'string') {
@@ -659,14 +662,19 @@ class MongoRepository {
         if (typeof addOnItemOfferedIdEq === 'string') {
             matchStages.push({
                 $match: {
-                    'offers.addOn.itemOffered.id': {
-                        $exists: true,
-                        $eq: addOnItemOfferedIdEq
-                    }
+                    'offers.addOn.itemOffered.id': { $exists: true, $eq: addOnItemOfferedIdEq }
                 }
             });
         }
-        const hasMerchantReturnPolicyIdEq = (_31 = (_30 = params.hasMerchantReturnPolicy) === null || _30 === void 0 ? void 0 : _30.id) === null || _31 === void 0 ? void 0 : _31.$eq;
+        const addOnItemOfferedIdIn = (_32 = (_31 = (_30 = params.addOn) === null || _30 === void 0 ? void 0 : _30.itemOffered) === null || _31 === void 0 ? void 0 : _31.id) === null || _32 === void 0 ? void 0 : _32.$in;
+        if (Array.isArray(addOnItemOfferedIdIn)) {
+            matchStages.push({
+                $match: {
+                    'offers.addOn.itemOffered.id': { $exists: true, $in: addOnItemOfferedIdIn }
+                }
+            });
+        }
+        const hasMerchantReturnPolicyIdEq = (_34 = (_33 = params.hasMerchantReturnPolicy) === null || _33 === void 0 ? void 0 : _33.id) === null || _34 === void 0 ? void 0 : _34.$eq;
         if (typeof hasMerchantReturnPolicyIdEq === 'string') {
             matchStages.push({
                 $match: {
@@ -677,7 +685,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyAll = (_32 = params.additionalProperty) === null || _32 === void 0 ? void 0 : _32.$all;
+        const additionalPropertyAll = (_35 = params.additionalProperty) === null || _35 === void 0 ? void 0 : _35.$all;
         if (Array.isArray(additionalPropertyAll)) {
             matchStages.push({
                 $match: {
@@ -688,7 +696,7 @@ class MongoRepository {
                 }
             });
         }
-        const additionalPropertyElemMatch = (_33 = params.additionalProperty) === null || _33 === void 0 ? void 0 : _33.$elemMatch;
+        const additionalPropertyElemMatch = (_36 = params.additionalProperty) === null || _36 === void 0 ? void 0 : _36.$elemMatch;
         if (additionalPropertyElemMatch !== undefined && additionalPropertyElemMatch !== null) {
             matchStages.push({
                 $match: {
@@ -824,8 +832,8 @@ class MongoRepository {
                     }, onlyValid: params.onlyValid === true }), (typeof params.limit === 'number' && typeof params.page === 'number')
                     ? { sort: { _id: 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対応(2023-09-05~)
-                offers = yield this.search(searchOffersConditions, params.projection, settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY);
+                // 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);
                 // 完全廃止(基本的にsortedOfferIdsと合わせて利用する想定)(2023-09-04~)
                 // if (params.sort) {
                 //     // sorting
@@ -897,7 +905,7 @@ class MongoRepository {
      * 強制的にoffersコレクションを使用する
      */
     useOffersAsPrimary) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             // primaryコレクションをコントロール(2023-09-05~)
             const useAggregateOfferAsPrimary = settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY && (useOffersAsPrimary !== true);
@@ -920,8 +928,10 @@ class MongoRepository {
             }
             // tslint:disable-next-line:no-single-line-block-comment
             /* istanbul ignore else */
-            if (((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) !== undefined) {
-                query.sort({ 'priceSpecification.price': params.sort['priceSpecification.price'] });
+            if (typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) === 'number') {
+                query.sort(Object.assign({ 'priceSpecification.price': params.sort['priceSpecification.price'] }, (typeof ((_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier) === 'number')
+                    ? { identifier: params.sort.identifier }
+                    : undefined));
             }
             return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
                 .exec()
@@ -959,7 +969,7 @@ class MongoRepository {
                     // 上書き禁止属性を除外
                     const { id, identifier, project, typeOf } = params, updateFields = __rest(params, ["id", "identifier", "project", "typeOf"]);
                     savedUnitPriceOffer = Object.assign(Object.assign({}, updateFields), { id: originalUnitPriceOffer.id, identifier: originalUnitPriceOffer.identifier, project: originalUnitPriceOffer.project, typeOf: originalUnitPriceOffer.typeOf });
-                    doc = yield this.offerModel.findOneAndUpdate({ 'offers.id': params.id }, {
+                    doc = yield this.aggregateOfferModel.findOneAndUpdate({ 'offers.id': params.id }, {
                         $set: {
                             'offers.$[offer]': savedUnitPriceOffer
                         }
@@ -1079,10 +1089,36 @@ class MongoRepository {
             if (params.addOn.itemOffered.id.$in.length === 0) {
                 return;
             }
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO USE_AGGREGATE_OFFERS_AS_PRIMARY対応(2023-09-05~)
+            // USE_AGGREGATE_OFFERS_AS_PRIMARY対応(2023-09-05~)
             if (settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY) {
-                throw new factory.errors.NotImplemented('USE_AGGREGATE_OFFERS_AS_PRIMARY not implemented');
+                const conditions = {
+                    'project.id': { $eq: params.project.id },
+                    'offers.addOn.itemOffered.id': { $exists: true, $in: params.addOn.itemOffered.id.$in }
+                };
+                const updatingOffers = yield this.searchFromAggregateOffer({
+                    project: { id: { $eq: params.project.id } },
+                    addOn: { itemOffered: { id: { $in: params.addOn.itemOffered.id.$in } } }
+                }, { id: 1 });
+                const result = yield this.aggregateOfferModel.updateMany(conditions, {
+                    $pull: {
+                        'offers.addOn': {
+                            'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
+                        }
+                    }
+                })
+                    .exec();
+                // 同期タスク作成(2023-09-05~)
+                if (updatingOffers.length > 0) {
+                    yield this.saveSyncTask({
+                        project: { id: params.project.id },
+                        id: { $in: updatingOffers.map((offer) => String(offer.id)) },
+                        identifier: { $in: [] },
+                        isDeleted: false,
+                        typeOf: factory.offerType.AggregateOffer,
+                        options: { emitImmediately: true }
+                    });
+                }
+                return result;
             }
             else {
                 const conditions = {
@@ -1117,13 +1153,22 @@ class MongoRepository {
     }
     deleteById(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            // tslint:disable-next-line:no-suspicious-comment
-            // TODO USE_AGGREGATE_OFFERS_AS_PRIMARY対応(2023-09-05~)
+            // USE_AGGREGATE_OFFERS_AS_PRIMARY対応(2023-09-05~)
             if (settings_1.USE_AGGREGATE_OFFERS_AS_PRIMARY) {
-                throw new factory.errors.NotImplemented('USE_AGGREGATE_OFFERS_AS_PRIMARY not implemented');
+                yield this.aggregateOfferModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
+                    .exec();
+                // 同期タスク作成(2023-09-03~)
+                yield this.saveSyncTask({
+                    project: { id: params.project.id },
+                    id: { $in: [params.id] },
+                    identifier: { $in: [] },
+                    isDeleted: true,
+                    typeOf: factory.offerType.AggregateOffer,
+                    options: { emitImmediately: true }
+                });
             }
             else {
-                yield this.offerModel.findOneAndRemove({ _id: params.id }, { projection: { _id: 1 } })
+                yield this.offerModel.findOneAndRemove({ _id: { $eq: params.id } }, { projection: { _id: 1 } })
                     .exec();
                 // 同期タスク作成(2023-09-03~)
                 yield this.saveSyncTask({
@@ -1248,7 +1293,13 @@ class MongoRepository {
                 const idIn = (_c = params.id) === null || _c === void 0 ? void 0 : _c.$in;
                 const identifierIn = (_d = params.identifier) === null || _d === void 0 ? void 0 : _d.$in;
                 if (params.isDeleted === true) {
-                    throw new factory.errors.NotImplemented('USE_AGGREGATE_OFFERS_AS_PRIMARY not implemented');
+                    if (Array.isArray(idIn) && idIn.length > 0) {
+                        yield this.offerModel.deleteMany({
+                            'project.id': { $eq: params.project.id },
+                            _id: { $in: idIn }
+                        })
+                            .exec();
+                    }
                 }
                 else {
                     let aggregateOffers = [];
@@ -1256,8 +1307,7 @@ class MongoRepository {
                         aggregateOffers = yield this.aggregateOfferModel.aggregate([
                             {
                                 $unwind: {
-                                    path: '$offers',
-                                    includeArrayIndex: OFFERS_ARRAY_INDEX_NAME
+                                    path: '$offers'
                                 }
                             },
                             {
@@ -1345,7 +1395,7 @@ class MongoRepository {
         });
     }
     searchFromAggregateOffer(params, projection) {
-        var _a;
+        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             const matchStages = MongoRepository.CREATE_AGGREGATE_OFFERS_MATCH_CONDITIONS(params);
             const projectStage = MongoRepository.CREATE_AGGREGATE_OFFERS_PROJECTION(Object.assign({}, projection));
@@ -1358,7 +1408,13 @@ class MongoRepository {
                 },
                 ...matchStages,
                 ...(typeof ((_a = params.sort) === null || _a === void 0 ? void 0 : _a['priceSpecification.price']) === 'number')
-                    ? [{ $sort: { 'offers.priceSpecification.price': params.sort['priceSpecification.price'] } }]
+                    ? [
+                        {
+                            $sort: Object.assign({ 'offers.priceSpecification.price': params.sort['priceSpecification.price'] }, (typeof ((_b = params.sort) === null || _b === void 0 ? void 0 : _b.identifier) === 'number')
+                                ? { 'offers.identifier': params.sort.identifier }
+                                : undefined)
+                        }
+                    ]
                     : [],
                 { $project: projectStage }
             ]);

package/lib/chevre/settings.d.ts

@@ -44,6 +44,7 @@ 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;
+export declare const USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG: boolean;
 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.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_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;
 const moment = require("moment");
 const factory = require("./factory");
 const transactionWebhookUrls = (typeof process.env.INFORM_TRANSACTION_URL === 'string')
@@ -76,6 +76,7 @@ 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';
+exports.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG = process.env.USE_AGGREGATE_OFFERS_AS_PRIMARY_ON_SEARCH_BY_CATALOG === '1';
 exports.MONGO_MAX_TIME_MS = (typeof process.env.MONGO_MAX_TIME_MS === 'string')
     ? Number(process.env.MONGO_MAX_TIME_MS)
     // tslint:disable-next-line:no-magic-numbers

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.6",
-    "@cinerino/sdk": "3.166.0-alpha.5",
+    "@chevre/factory": "4.329.0-alpha.7",
+    "@cinerino/sdk": "3.166.0-alpha.7",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -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.34"
+  "version": "21.8.0-alpha.36"
 }