@chevre/domain 21.19.0-alpha.0 → 21.19.0-alpha.2

package/example/src/chevre/optimizeOffers.ts

@@ -0,0 +1,16 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
+    const result = await aggregateOfferRepo.optimizeOffers();
+    console.log('result:', result);
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -65,5 +65,9 @@ export declare class MongoRepository {
         };
         id: string;
     }): Promise<void>;
+    /**
+     * 単価オファー最適化作業における一時的な処理
+     */
+    optimizeOffers(): Promise<import("mongodb").UpdateResult>;
 }
 export {};

package/lib/chevre/repo/aggregateOffer.js

@@ -562,5 +562,19 @@ class MongoRepository {
                 .exec();
         });
     }
+    /**
+     * 単価オファー最適化作業における一時的な処理
+     */
+    optimizeOffers() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.aggregateOfferModel.updateMany({
+                $or: [
+                    { 'offers.id': { $exists: true } },
+                    { 'offers.project': { $exists: true } }
+                ]
+            }, { $set: {} })
+                .exec();
+        });
+    }
 }
 exports.MongoRepository = MongoRepository;

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

@@ -52,14 +52,15 @@ const indexes = [
         { 'offers.priceSpecification.price': 1 },
         { name: 'searchByOffersPriceSpecificationPrice' }
     ],
-    [
-        // オファーIDはグローバルユニーク
-        { 'offers.id': 1 },
-        {
-            name: 'uniqueOfferId',
-            unique: true
-        }
-    ],
+    // ↓サブオファー最適化につき廃止(2023-12-22~)
+    // [
+    //     // オファーIDはグローバルユニーク
+    //     { 'offers.id': 1 },
+    //     {
+    //         name: 'uniqueOfferId',
+    //         unique: true
+    //     }
+    // ],
     [
         // オファーコードはプロジェクト内ユニーク
         { 'offers.identifier': 1, 'project.id': 1 },

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

@@ -152,7 +152,9 @@ export declare class MongoRepository {
     }[]>;
     count(params: Omit<factory.unitPriceOffer.ISearchConditions, 'limit' | 'page' | 'sort'>): Promise<number>;
     search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<IUnitPriceOfferFromAggregateOffer[]>;
-    save(params: factory.unitPriceOffer.IUnitPriceOffer & {}): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
+    save(params: factory.unitPriceOffer.IUnitPriceOffer & {}): Promise<{
+        id: string;
+    }>;
     /**
      * コードをキーにして冪等置換(2023-12-13~)
      */
@@ -167,7 +169,10 @@ export declare class MongoRepository {
      * sskts専用オファー保管
      */
     saveManyByIdentifier(params: {
-        attributes: Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
+        project: {
+            id: string;
+        };
+        attributes: factory.aggregateOffer.ISubOffer;
         upsert?: boolean;
     }[]): Promise<void>;
     /**

package/lib/chevre/repo/offer.js

@@ -775,21 +775,26 @@ class MongoRepository {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
+            let aggregateOfferId;
             // const { $unset, ...paramsWithoutUnset } = params;
             const paramsWithoutUnset = __rest(params, []);
-            let savedUnitPriceOffer;
-            if (params.id === '') {
+            // let savedUnitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer;
+            if (typeof params.id !== 'string' || params.id.length === 0) {
                 const uniqid = yield Promise.resolve().then(() => require('uniqid'));
-                const id = uniqid();
-                savedUnitPriceOffer = Object.assign(Object.assign({}, paramsWithoutUnset), { id });
+                const newId = uniqid();
+                aggregateOfferId = newId;
+                // サブオファー最適化(2023-12-22~)
+                // savedUnitPriceOffer = { ...paramsWithoutUnset, id };
+                const { id, project } = paramsWithoutUnset, savedUnitPriceOffer = __rest(paramsWithoutUnset, ["id", "project"]);
                 const aggregateOffer = {
                     typeOf: factory.offerType.AggregateOffer,
                     project: params.project,
                     offers: [savedUnitPriceOffer]
                 };
-                doc = yield this.aggregateOfferModel.create(Object.assign(Object.assign({}, aggregateOffer), { _id: id }));
+                doc = yield this.aggregateOfferModel.create(Object.assign(Object.assign({}, aggregateOffer), { _id: newId }));
             }
             else {
+                aggregateOfferId = params.id;
                 const unitPriceOffers = yield this.search({
                     limit: 1,
                     page: 1,
@@ -802,14 +807,19 @@ class MongoRepository {
                 }
                 // 上書き禁止属性を除外
                 const { id, identifier, project, typeOf } = paramsWithoutUnset, updateFields = __rest(paramsWithoutUnset, ["id", "identifier", "project", "typeOf"]);
-                savedUnitPriceOffer = Object.assign(Object.assign({}, updateFields), { id: originalUnitPriceOffer.id, identifier: originalUnitPriceOffer.identifier, project: originalUnitPriceOffer.project, typeOf: originalUnitPriceOffer.typeOf });
+                // サブオファー最適化(2023-12-22~)
+                const subOffer = Object.assign(Object.assign({}, updateFields), { 
+                    // id: originalUnitPriceOffer.id,
+                    identifier: originalUnitPriceOffer.identifier, 
+                    // project: originalUnitPriceOffer.project,
+                    typeOf: originalUnitPriceOffer.typeOf });
                 doc = yield this.aggregateOfferModel.findOneAndUpdate(
                 // { 'offers.id': params.id },
                 { _id: params.id }, // _idに変更(2023-12-22~)
                 {
                     $set: {
                         // 'offers.$[offer]': savedUnitPriceOffer
-                        'offers.0': savedUnitPriceOffer // _idに変更(2023-12-22~)
+                        'offers.0': subOffer // _idに変更(2023-12-22~)
                     }
                 }, {
                     upsert: false,
@@ -824,7 +834,7 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.aggregateOfferModel.modelName);
             }
-            return savedUnitPriceOffer;
+            return { id: aggregateOfferId };
         });
     }
     /**
@@ -852,11 +862,13 @@ class MongoRepository {
                         'offers.identifier': { $exists: true, $eq: p.identifier }
                     });
                     const newOfferId = uniqid(); // setOnInsert時のみに利用する新ID
-                    const unitPriceOffer = Object.assign(Object.assign({}, p), { id: newOfferId });
+                    // サブオファー最適化(2023-12-22~)
+                    // const subOffer: factory.aggregateOffer.ISubOffer = { ...p, id: newOfferId };
+                    const { project } = p, subOffer = __rest(p, ["project"]);
                     const aggregateOffer = {
                         project: p.project,
                         typeOf: factory.offerType.AggregateOffer,
-                        offers: [unitPriceOffer]
+                        offers: [subOffer]
                     };
                     const setOnInsert = Object.assign(Object.assign({}, aggregateOffer), { _id: newOfferId });
                     const updateFilter = { $setOnInsert: setOnInsert };
@@ -885,9 +897,11 @@ class MongoRepository {
                         'project.id': { $eq: p.project.id },
                         'offers.identifier': { $exists: true, $eq: p.identifier }
                     };
-                    const unitPriceOffer = Object.assign(Object.assign({}, p), { id: originalAggregateOffer.id });
+                    // サブオファー最適化(2023-12-22~)
+                    // const unitPriceOffer: factory.unitPriceOffer.IUnitPriceOffer = { ...p, id: originalAggregateOffer.id };
+                    const { project } = p, subOffer = __rest(p, ["project"]);
                     const setOnUpdate = {
-                        'offers.0': unitPriceOffer
+                        'offers.0': subOffer
                     };
                     const updateOne = {
                         filter,
@@ -915,16 +929,18 @@ class MongoRepository {
             if (Array.isArray(params)) {
                 params.forEach((p) => {
                     const newOfferId = uniqid();
-                    const unitPriceOffer = Object.assign(Object.assign({}, p.attributes), { id: newOfferId });
+                    // サブオファー最適化(2023-12-22~)
+                    // const unitPriceOffer: factory.aggregateOffer.ISubOffer = { ...p.attributes, id: newOfferId };
+                    const subOffer = Object.assign({}, p.attributes);
                     const aggregateOffer = {
-                        project: p.attributes.project,
+                        project: { id: p.project.id, typeOf: factory.organizationType.Project },
                         typeOf: factory.offerType.AggregateOffer,
-                        offers: [unitPriceOffer]
+                        offers: [subOffer]
                     };
                     insertBulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                'project.id': { $eq: p.attributes.project.id },
+                                'project.id': { $eq: p.project.id },
                                 'offers.identifier': { $exists: true, $eq: p.attributes.identifier }
                             },
                             update: {
@@ -933,12 +949,12 @@ class MongoRepository {
                             upsert: true
                         }
                     });
-                    const { id } = unitPriceOffer, $set = __rest(unitPriceOffer, ["id"]);
+                    const $set = __rest(subOffer, []);
                     updateBulkWriteOps.push({
                         updateOne: {
                             filter: {
-                                'project.id': { $eq: unitPriceOffer.project.id },
-                                'offers.identifier': { $exists: true, $eq: unitPriceOffer.identifier }
+                                'project.id': { $eq: aggregateOffer.project.id },
+                                'offers.identifier': { $exists: true, $eq: subOffer.identifier }
                             },
                             update: {
                                 // 特定の属性のみ更新する(IDを上書きできないので)

package/lib/chevre/service/offer/event/factory.d.ts

@@ -37,12 +37,9 @@ export declare function responseBody2acceptedOffers4result(params: {
     seller: factory.transaction.placeOrder.ISeller;
 }): IResultAcceptedOffer[];
 export declare function coaTicket2offer(params: {
-    project: {
-        id: string;
-    };
     theaterCode: string;
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
     defaultMembershipType?: factory.categoryCode.ICategoryCode;
-}): Omit<factory.unitPriceOffer.IUnitPriceOffer, 'id'>;
+}): factory.aggregateOffer.ISubOffer;
 export {};

package/lib/chevre/service/offer/event/factory.js

@@ -340,7 +340,9 @@ function coaTicket2offer(params) {
             ? params.ticketResult.ticketNameEng
             : ''
     };
-    return Object.assign(Object.assign(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
+    return Object.assign(Object.assign(Object.assign({ 
+        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY, 
         // id: '',
         identifier: identifier, name: offerName, description: {
             ja: '',

package/lib/chevre/service/offer/event/importFromCOA.js

@@ -34,13 +34,13 @@ function importFromCOA(params) {
             const ticketResults = yield repos.masterService.ticket({ theaterCode: params.theaterCode });
             const saveParams = ticketResults.map((ticketResult) => {
                 const offer = (0, factory_1.coaTicket2offer)({
-                    project: params.project,
+                    // project: params.project,
                     theaterCode: params.theaterCode,
                     ticketResult: ticketResult,
                     defaultCurrencyType,
                     defaultMembershipType
                 });
-                return { attributes: offer, upsert: true };
+                return { attributes: offer, upsert: true, project: { id: params.project.id } };
             });
             yield repos.offer.saveManyByIdentifier(saveParams);
         }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.347.0",
+    "@chevre/factory": "4.348.0-alpha.0",
     "@cinerino/sdk": "5.5.0",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.19.0-alpha.0"
+  "version": "21.19.0-alpha.2"
 }