@chevre/domain 21.8.0-alpha.26 → 21.8.0-alpha.27

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

@@ -66,9 +66,12 @@ export declare class MongoRepository {
     }): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
     count(params: factory.unitPriceOffer.ISearchConditions): Promise<number>;
     search(params: factory.unitPriceOffer.ISearchConditions, projection?: IProjection): Promise<factory.unitPriceOffer.IUnitPriceOffer[]>;
-    save(params: factory.unitPriceOffer.IUnitPriceOffer): Promise<factory.unitPriceOffer.IUnitPriceOffer>;
+    save(params: factory.aggregateOffer.IAggregateOffer): Promise<factory.aggregateOffer.IAggregateOffer>;
+    /**
+     * sskts専用オファー保管
+     */
     saveManyByIdentifier(params: {
-        attributes: factory.unitPriceOffer.IUnitPriceOffer;
+        attributes: factory.aggregateOffer.IAggregateOffer;
         upsert?: boolean;
     }[]): Promise<void>;
     /**

package/lib/chevre/repo/offer.js

@@ -447,9 +447,14 @@ class MongoRepository {
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let doc;
+            // AggregateOffer対応(2023-09-03~)
+            if (!Array.isArray(params.offers) || params.offers.length === 0) {
+                throw new factory.errors.ArgumentNull('aggregateOffer.offers');
+            }
             if (params.id === '') {
                 const id = uniqid();
-                doc = yield this.offerModel.create(Object.assign(Object.assign({}, params), { _id: id }));
+                doc = yield this.offerModel.create(Object.assign(Object.assign({}, params), { _id: id, 'offers.id': id // AggregateOffer対応(2023-09-03~)
+                 }));
             }
             else {
                 // 上書き禁止属性を除外(2022-08-24~)
@@ -463,11 +468,18 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    /**
+     * sskts専用オファー保管
+     */
     saveManyByIdentifier(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const bulkWriteOps = [];
             if (Array.isArray(params)) {
                 params.forEach((p) => {
+                    // AggregateOffer対応(2023-09-03~)
+                    if (!Array.isArray(p.attributes.offers) || p.attributes.offers.length === 0) {
+                        throw new factory.errors.ArgumentNull('aggregateOffer.offers');
+                    }
                     const id = uniqid();
                     const $set = Object.assign({}, p.attributes);
                     if (typeof $set.id === 'string') {
@@ -486,7 +498,10 @@ class MongoRepository {
                             },
                             update: {
                                 $set: $set,
-                                $setOnInsert: { _id: id }
+                                $setOnInsert: {
+                                    _id: id,
+                                    'offers.id': id // AggregateOffer対応(2023-09-03~)
+                                }
                             },
                             upsert: (p.upsert !== undefined) ? p.upsert : false
                         }
@@ -513,6 +528,9 @@ class MongoRepository {
                 $pull: {
                     addOn: {
                         'itemOffered.id': { $in: params.addOn.itemOffered.id.$in }
+                    },
+                    'offers.addOn': {
+                        'itemOffered.id': { $in: params.addOn.itemOffered.id.$in } // AggregateOffer対応(2023-09-03~)
                     }
                 }
             })

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

@@ -44,5 +44,5 @@ export declare function coaTicket2offer(params: {
     ticketResult: COA.factory.master.ITicketResult;
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
     defaultMembershipType?: factory.categoryCode.ICategoryCode;
-}): factory.unitPriceOffer.IUnitPriceOffer;
+}): factory.aggregateOffer.IAggregateOffer;
 export {};

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

@@ -340,17 +340,7 @@ function coaTicket2offer(params) {
             ? params.ticketResult.ticketNameEng
             : ''
     };
-    const subOfferPriceSpec = {
-        price: unitPriceSpec.price,
-        typeOf: unitPriceSpec.typeOf
-    };
-    const subOffers = [{
-            typeOf: factory.offerType.Offer,
-            identifier: identifier,
-            name: offerName,
-            priceSpecification: subOfferPriceSpec
-        }];
-    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: {
+    const unitPriceOffer = 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: '',
             en: ''
         }, alternateName: {
@@ -360,12 +350,14 @@ function coaTicket2offer(params) {
                 : ''
         }, availability: factory.itemAvailability.InStock, itemOffered: {
             typeOf: factory.product.ProductType.EventService
-        }, offers: subOffers, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
+        }, priceSpecification: unitPriceSpec }, (Array.isArray(eligibleMembershipType)) ? { eligibleMembershipType } : undefined), (Array.isArray(eligibleMonetaryAmount)) ? { eligibleMonetaryAmount } : undefined), { additionalProperty: [
             { name: 'theaterCode', value: params.theaterCode },
             ...Object.keys(params.ticketResult)
                 .map((key) => {
                 return { name: String(key), value: String(params.ticketResult[key]) };
             })
         ] });
+    const subOffers = [unitPriceOffer];
+    return Object.assign(Object.assign({}, unitPriceOffer), { offers: subOffers });
 }
 exports.coaTicket2offer = coaTicket2offer;

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.329.0-alpha.3",
+    "@chevre/factory": "4.329.0-alpha.4",
     "@cinerino/sdk": "3.166.0-alpha.5",
     "@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.8.0-alpha.26"
+  "version": "21.8.0-alpha.27"
 }

package/example/src/chevre/migrateAuthorizePaymentActionResult.ts

@@ -1,83 +0,0 @@
-// tslint:disable:no-console
-import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-// const project = { id: String(process.env.PROJECT_ID) };
-// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
-
-// tslint:disable-next-line:max-func-body-length
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const actionRepo = new chevre.repository.Action(mongoose.connection);
-
-    const cursor = actionRepo.getCursor(
-        {
-            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction },
-            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
-            'object.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            'result.typeOf': { $exists: true, $eq: chevre.factory.action.authorize.paymentMethod.any.ResultType.Payment },
-            startDate: {
-                $gte: moment('2022-08-16T00:00:00Z')
-                    .toDate()
-                // $lte: moment('2023-08-01T00:00:00Z')
-                //     .toDate()
-            }
-        },
-        {
-            _id: 1,
-            typeOf: 1,
-            result: 1,
-            project: 1,
-            startDate: 1,
-            actionStatus: 1
-        }
-    );
-    console.log('actions found');
-
-    let i = 0;
-    let updateCount = 0;
-    await cursor.eachAsync(async (doc) => {
-        i += 1;
-        const action: Pick<
-            chevre.factory.action.authorize.paymentMethod.any.IAction,
-            'id' | 'project' | 'result' | 'typeOf' | 'startDate' | 'actionStatus'
-        > = doc.toObject();
-
-        const oldPaymentMethodType = (<any>action).result?.paymentMethod;
-        const paymentMethodType = action.result?.paymentMethodAsObject?.typeOf;
-        const alreadyMigrated = typeof paymentMethodType === 'string' && oldPaymentMethodType === paymentMethodType;
-
-        if (alreadyMigrated) {
-            console.log('already exist...', action.project.id, action.id, action.startDate, paymentMethodType, i);
-        } else {
-            if (typeof oldPaymentMethodType !== 'string') {
-                console.error('updating action...', action.project.id, action.id, action.startDate, oldPaymentMethodType, i, updateCount);
-                throw new Error('oldPaymentMethodType undefined');
-            }
-
-            const newPaymentMethodAsObject: chevre.factory.action.authorize.paymentMethod.any.IResultPaymentMethod = {
-                typeOf: oldPaymentMethodType
-            };
-            console.log(
-                'updating action...', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
-            await actionRepo.updateById({
-                id: action.id,
-                update: {
-                    'result.paymentMethodAsObject': newPaymentMethodAsObject
-                }
-            });
-            updateCount += 1;
-            console.log('updated.', action.project.id, action.id, action.startDate, newPaymentMethodAsObject.typeOf, i, updateCount);
-        }
-    });
-
-    console.log(i, 'actions checked');
-    console.log(updateCount, 'actions updated');
-}
-
-main()
-    .then()
-    .catch(console.error);