@chevre/domain 20.3.0-alpha.1 → 20.3.0-alpha.3

package/example/src/chevre/updateOfferCatalogs.ts

@@ -0,0 +1,40 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const offerCatalogRepo = new chevre.repository.OfferCatalog(mongoose.connection);
+
+    await offerCatalogRepo.updateManyById({
+        id: { $in: ['0002'] },
+        $pull: {
+            itemListElement: {
+                $elemMatch: {
+                    id: {
+                        $in: [
+                            // 'al96nqj7z',
+                            // 'akxecjgeu'
+                        ]
+                    }
+                }
+            }
+        },
+        $push: {
+            itemListElement: {
+                $each: [
+                    { typeOf: chevre.factory.offerType.Offer, id: 'al96nqj7z' },
+                    { typeOf: chevre.factory.offerType.Offer, id: 'akxecjgeu' }
+                ],
+                $slice: 200
+            }
+        }
+    });
+    console.log('updated');
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

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

@@ -8,6 +8,26 @@ export declare class MongoRepository {
     constructor(connection: Connection);
     static CREATE_MONGO_CONDITIONS(params: factory.offerCatalog.ISearchConditions): any[];
     save(params: factory.offerCatalog.IOfferCatalog): Promise<factory.offerCatalog.IOfferCatalog>;
+    updateManyById(params: {
+        id: {
+            $in: string[];
+        };
+        $push: {
+            itemListElement: {
+                $each: factory.offerCatalog.IItemListElement[];
+                $slice: number;
+            };
+        };
+        $pull: {
+            itemListElement: {
+                $elemMatch: {
+                    id: {
+                        $in: string[];
+                    };
+                };
+            };
+        };
+    }): Promise<void>;
     findById(params: {
         id: string;
     }): Promise<factory.offerCatalog.IOfferCatalog>;

package/lib/chevre/repo/offerCatalog.js

@@ -144,6 +144,40 @@ class MongoRepository {
             return doc.toObject();
         });
     }
+    updateManyById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!Array.isArray(params.id.$in) || params.id.$in.length === 0) {
+                return;
+            }
+            const pushItemListElementIds = params.$push.itemListElement.$each.map((element) => element.id);
+            yield this.offerCatalogModel.updateMany(Object.assign({ _id: { $in: params.id.$in } }, (pushItemListElementIds.length > 0)
+                // itemListElementのユニークネスを保証する
+                ? {
+                    'itemListElement.id': {
+                        $nin: pushItemListElementIds
+                    }
+                }
+                : undefined), Object.assign(Object.assign({}, (pushItemListElementIds.length > 0)
+                ? {
+                    $push: {
+                        itemListElement: {
+                            $each: params.$push.itemListElement.$each,
+                            $slice: params.$push.itemListElement.$slice
+                        }
+                    }
+                }
+                : undefined), (params.$pull.itemListElement.$elemMatch.id.$in.length > 0)
+                ? {
+                    $pull: {
+                        itemListElement: {
+                            id: { $in: params.$pull.itemListElement.$elemMatch.id.$in }
+                        }
+                    }
+                }
+                : undefined))
+                .exec();
+        });
+    }
     findById(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const doc = yield this.offerCatalogModel.findOne({

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

@@ -9,7 +9,7 @@ function createReserveTransactionStartParams(params) {
     var _a, _b;
     const acceptedTicketOffersWithoutDetail = (Array.isArray(params.object.acceptedOffer))
         ? params.object.acceptedOffer.map((o) => {
-            var _a, _b, _c, _d, _e, _f;
+            var _a, _b, _c, _d, _e;
             const issuedBy = {
                 typeOf: params.transaction.seller.typeOf,
                 name: (typeof params.transaction.seller.name === 'string')
@@ -27,11 +27,11 @@ function createReserveTransactionStartParams(params) {
                 // } else if (typeof o.movieTicketIdentifire === 'string') {
                 // appliesToMovieTicket = { identifier: o.movieTicketIdentifire };
             }
-            return Object.assign(Object.assign(Object.assign({ 
+            return Object.assign(Object.assign({ 
                 // 必要な属性のみ指定する
                 id: o.id, itemOffered: Object.assign(Object.assign({}, o.itemOffered), { serviceOutput: Object.assign(Object.assign({}, (_c = o.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput), { reservedTicket: Object.assign(Object.assign({}, (_e = (_d = o.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.reservedTicket), { 
                             // issuedByを明示的に指定する
-                            issuedBy, typeOf: 'Ticket' }), typeOf: factory.reservationType.EventReservation }) }) }, (Array.isArray(o.addOn)) ? { addOn: o.addOn } : undefined), (typeof ((_f = o.paymentMethod) === null || _f === void 0 ? void 0 : _f.typeOf) === 'string') ? { paymentMethod: o.paymentMethod } : undefined), (appliesToMovieTicket !== undefined)
+                            issuedBy, typeOf: 'Ticket' }), typeOf: factory.reservationType.EventReservation }) }) }, (Array.isArray(o.addOn)) ? { addOn: o.addOn } : undefined), (appliesToMovieTicket !== undefined)
                 ? { priceSpecification: { appliesToMovieTicket } }
                 : undefined);
         })

package/lib/chevre/service/payment/movieTicket.js

@@ -186,6 +186,7 @@ function purchaseNumberAuthResult2movieTickets(params) {
         purchaseNumberAuthResult.knyknrNoInfoOut.forEach((knyknrNoInfoOut) => {
             const knyknrNoInfo = knyknrNoInfoIn.find((info) => info.knyknrNo === knyknrNoInfoOut.knyknrNo);
             if (knyknrNoInfo !== undefined) {
+                const movieTicketCategoryCode = knyknrNoInfoOut.znkkkytsknGkjknTyp;
                 if (Array.isArray(knyknrNoInfoOut.ykknInfo)) {
                     knyknrNoInfoOut.ykknInfo.forEach((ykknInfo) => {
                         // tslint:disable-next-line:prefer-array-literal
@@ -195,6 +196,9 @@ function purchaseNumberAuthResult2movieTickets(params) {
                                 typeOf: paymentMethodType,
                                 identifier: knyknrNoInfo.knyknrNo,
                                 accessCode: knyknrNoInfo.pinCd,
+                                category: {
+                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
+                                },
                                 serviceType: ykknInfo.ykknshTyp,
                                 serviceOutput: {
                                     reservationFor: {
@@ -219,7 +223,9 @@ function purchaseNumberAuthResult2movieTickets(params) {
                     knyknrNoInfoOut.mkknInfo.forEach((mkknInfo) => {
                         // tslint:disable-next-line:prefer-array-literal
                         [...Array(Number(mkknInfo.mkknKnshbtsmiNum))].forEach(() => {
-                            movieTickets.push(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id }, typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, amount: {
+                            movieTickets.push(Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.screeningEvent.project.id }, typeOf: paymentMethodType, identifier: knyknrNoInfo.knyknrNo, accessCode: knyknrNoInfo.pinCd, category: {
+                                    codeValue: movieTicketCategoryCode // 追加(2023-02-08~)
+                                }, amount: {
                                     typeOf: 'MonetaryAmount',
                                     currency: factory.priceCurrency.JPY,
                                     validThrough: moment(`${mkknInfo.yykDt}+09:00`, 'YYYY/MM/DD HH:mm:ssZ')

package/lib/chevre/service/transaction/placeOrderInProgress/validation/validateMovieTicket.js

@@ -155,7 +155,7 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
                             requiredMovieTickets.push({
-                                project: action.project,
+                                // project: action.project,
                                 typeOf: paymentMethodType,
                                 identifier: String(appliesToMovieTicket.identifier),
                                 serviceType: appliesToMovieTicket.serviceType,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.288.0-alpha.0",
+    "@chevre/factory": "4.288.0-alpha.1",
     "@cinerino/sdk": "3.138.1",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.3.0-alpha.1"
+  "version": "20.3.0-alpha.3"
 }