@chevre/domain 23.2.0-alpha.50 → 23.2.0-alpha.52

package/example/src/chevre/acceptedPaymentMethodOffer/adminAcceptedPaymentMethodOffers.ts

@@ -16,27 +16,17 @@ async function main() {
     const validThrough = moment(validFrom)
         .add(1, 'hour')
         .toDate();
-    const settingOffer: Omit<chevre.factory.acceptedPaymentMethodOffer.IAcceptedPaymentMethodOffer, 'id'> = {
-        typeOf: chevre.factory.offerType.Offer,
-        identifier: '20251202acceptedPaymentMethod',
-        itemOffered: {
-            id: '7k9ayl8hc',
-            typeOf: chevre.factory.eventType.ScreeningEventSeries
-        },
+    const settingOffer: Pick<chevre.factory.acceptedPaymentMethodOffer.IAcceptedPaymentMethodOffer, 'acceptedPaymentMethod' | 'identifier' | 'validFrom' | 'validThrough'> = {
+        identifier: '20260206acceptedPaymentMethod',
         acceptedPaymentMethod: {
             id: '5f9a52994f3709000abe6417',
             typeOf: chevre.factory.service.paymentService.PaymentServiceType.MovieTicket
         },
         validFrom,
-        validThrough,
-        seller: {
-            id: '59d20831e53ebc2b4e774466',
-            typeOf: chevre.factory.organizationType.Corporation
-        },
-        project: { id: project.id, typeOf: chevre.factory.organizationType.Project }
+        validThrough
     };
 
-    let result = await acceptedPaymentMethodRepo.upsertAcceptedPaymentMethodsByIdentifier(
+    let result = await acceptedPaymentMethodRepo.addAcceptedPaymentMethodsByIdentifier(
         [
             {
                 $set: settingOffer,
@@ -44,12 +34,21 @@ async function main() {
             }
         ],
         {
-            update: false
+            upsert: false,
+            itemOffered: {
+                id: '7k9ayl8hc',
+                typeOf: chevre.factory.eventType.ScreeningEventSeries
+            },
+            seller: {
+                id: '59d20831e53ebc2b4e774466',
+                typeOf: chevre.factory.organizationType.Corporation
+            },
+            project: { id: project.id, typeOf: chevre.factory.organizationType.Project }
         }
     );
     console.log(result);
 
-    result = await acceptedPaymentMethodRepo.upsertAcceptedPaymentMethodsByIdentifier(
+    result = await acceptedPaymentMethodRepo.addAcceptedPaymentMethodsByIdentifier(
         [
             {
                 $set: settingOffer,
@@ -57,7 +56,16 @@ async function main() {
             }
         ],
         {
-            update: true
+            upsert: true,
+            itemOffered: {
+                id: '7k9ayl8hc',
+                typeOf: chevre.factory.eventType.ScreeningEventSeries
+            },
+            seller: {
+                id: '59d20831e53ebc2b4e774466',
+                typeOf: chevre.factory.organizationType.Corporation
+            },
+            project: { id: project.id, typeOf: chevre.factory.organizationType.Project }
         }
     );
     console.log(result);

package/example/src/chevre/settings/addOrderNumberSetting.ts

@@ -24,7 +24,7 @@ async function main() {
             { project: { id: { $eq: '*' } } },
             {
                 orderNumber: {
-                    validFrom: moment('2026-02-05T00:00:00Z')
+                    validFrom: moment('2027-02-11T15:00:00Z')
                         .toDate(),
                     fpeSecret: FPE_SECRET,
                     version: 'A'

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

@@ -20,22 +20,25 @@ export declare class AcceptedPaymentMethodRepo {
     /**
      * オファーコードと提供リソースIDをキーにして冪等置換
      */
-    upsertAcceptedPaymentMethodsByIdentifier(params: {
-        $set: Pick<IDocType, 'identifier' | 'itemOffered' | 'acceptedPaymentMethod' | 'seller' | 'project' | 'typeOf' | 'validFrom' | 'validThrough'> & {
+    addAcceptedPaymentMethodsByIdentifier(params: {
+        $set: Pick<IDocType, 'identifier' | 'acceptedPaymentMethod' | 'validFrom' | 'validThrough'> & {
             id?: never;
         };
         $unset: IUnset;
     }[], options: {
         /**
          * falseの場合setOnInsertのみ
-         * trueの場合setのみ
+         * trueの場合setOnInsert+set
          */
-        update: boolean;
+        upsert: boolean;
+        project: factory.acceptedPaymentMethodOffer.IAcceptedPaymentMethodOffer['project'];
+        seller: factory.acceptedPaymentMethodOffer.IAcceptedPaymentMethodOffer['seller'];
+        itemOffered: factory.acceptedPaymentMethodOffer.IAcceptedPaymentMethodOffer['itemOffered'];
     }): Promise<{
-        bulkWriteResult: BulkWriteResult;
-        modifiedProductOffers: {
+        bulkWriteResult?: BulkWriteResult;
+        modifiedOffers: {
             id: string;
         }[];
-    } | void>;
+    }>;
 }
 export {};

package/lib/chevre/repo/acceptedPaymentMethod.js

@@ -108,14 +108,15 @@ class AcceptedPaymentMethodRepo {
     /**
      * オファーコードと提供リソースIDをキーにして冪等置換
      */
-    upsertAcceptedPaymentMethodsByIdentifier(params, options) {
+    // tslint:disable-next-line:max-func-body-length
+    addAcceptedPaymentMethodsByIdentifier(params, options) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { update } = options;
+            const { upsert, project, seller, itemOffered } = options;
             const bulkWriteOps = [];
             const queryFilters = [];
             if (Array.isArray(params)) {
                 params.forEach(({ $set, $unset }) => {
-                    const { identifier, itemOffered, acceptedPaymentMethod, seller, project, validFrom, validThrough } = $set;
+                    const { identifier, acceptedPaymentMethod, validFrom, validThrough } = $set;
                     if (typeof identifier !== 'string' || identifier === '') {
                         throw new factory.errors.ArgumentNull('identifier');
                     }
@@ -133,30 +134,27 @@ class AcceptedPaymentMethodRepo {
                         'itemOffered.id': { $eq: itemOffered.id },
                         identifier: { $eq: identifier }
                     });
-                    if (update === true) {
-                        const setFields = {
-                            validFrom,
-                            validThrough,
-                            acceptedPaymentMethod
-                        };
-                        const updateFilter = Object.assign({ $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
+                    const setOnInsert = {
+                        identifier, itemOffered, project, seller,
+                        typeOf: factory.offerType.Offer
+                    };
+                    const setFields = {
+                        acceptedPaymentMethod,
+                        validFrom,
+                        validThrough
+                    };
+                    if (upsert) {
+                        const updateFilter = Object.assign({ $setOnInsert: setOnInsert, $set: setFields }, ($unset !== undefined) ? { $unset } : undefined);
                         const updateOne = {
                             filter,
                             update: updateFilter,
-                            upsert: false
+                            upsert: true
                         };
                         bulkWriteOps.push({ updateOne });
                     }
                     else {
-                        const setOnInsert = {
-                            itemOffered, identifier, project, seller,
-                            typeOf: factory.offerType.Offer,
-                            validFrom,
-                            validThrough,
-                            acceptedPaymentMethod
-                        };
                         const updateFilter = {
-                            $setOnInsert: setOnInsert
+                            $setOnInsert: Object.assign(Object.assign({}, setOnInsert), setFields) // 存在しなければ追加のみ
                         };
                         const updateOne = {
                             filter,
@@ -169,15 +167,27 @@ class AcceptedPaymentMethodRepo {
             }
             if (bulkWriteOps.length > 0) {
                 const bulkWriteResult = yield this.acceptedPaymentMethodModel.bulkWrite(bulkWriteOps, { ordered: false });
-                // modifiedの場合upsertedIdsに含まれないので、idを検索する
-                const modifiedProductOffers = yield this.acceptedPaymentMethodModel.find({ $or: queryFilters }, {
-                    _id: 0,
-                    id: { $toString: '$_id' }
-                })
-                    .lean()
-                    .exec();
-                return { bulkWriteResult, modifiedProductOffers };
+                // upsert:falseの場合、upsertedIdsのみ返せばよい
+                if (!upsert) {
+                    // BulkWriteResult -> upsertedIds: { '0': '7iri6p4m54k0r3g' }
+                    return {
+                        bulkWriteResult,
+                        modifiedOffers: Object.values(bulkWriteResult.upsertedIds)
+                            .map((id) => ({ id: String(id) }))
+                    };
+                }
+                else {
+                    // modifiedの場合upsertedIdsに含まれないので、idを検索する
+                    const modifiedOffers = yield this.acceptedPaymentMethodModel.find({ $or: queryFilters }, {
+                        _id: 0,
+                        id: { $toString: '$_id' }
+                    })
+                        .lean()
+                        .exec();
+                    return { bulkWriteResult, modifiedOffers };
+                }
             }
+            return { modifiedOffers: [] };
         });
     }
 }

package/lib/chevre/repo/orderNumber.js

@@ -22,6 +22,11 @@ const setting_1 = require("./mongoose/schemas/setting");
 const transactionNumber_2 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
+const versioningForceProjects = [
+    'HMX',
+    'SMT',
+    'KOJ'
+];
 /**
  * 注文番号リポジトリ
  */
@@ -77,8 +82,10 @@ class OrderNumberRepo {
                 expires: dataFeedExpires
             });
             let orderNumber;
-            const useVersioning = validFrom instanceof Date && moment(validFrom)
-                .isSameOrBefore(params.orderDate);
+            // versioningForceProjectsであれば強制的にversioning(2026-02-05~)
+            const useVersioning = (validFrom instanceof Date && moment(validFrom)
+                .isSameOrBefore(params.orderDate))
+                || versioningForceProjects.includes(projectPrefix);
             if (typeof fpeSecret === 'string' && typeof version === 'string' && useVersioning) {
                 const transactionFactory = new transactionNumber_1.TransactionNumberFactory({ fpeSecret, version });
                 orderNumber = transactionFactory.generate(timestamp, incrReply);

package/package.json

@@ -12,7 +12,7 @@
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
     "@chevre/factory": "5.4.0-alpha.25",
-    "@cinerino/sdk": "13.0.0-alpha.1",
+    "@cinerino/sdk": "13.0.0-alpha.3",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -118,5 +118,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.2.0-alpha.50"
+  "version": "23.2.0-alpha.52"
 }