@chevre/domain 21.29.0-alpha.5 → 21.29.0-alpha.7

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -8,22 +8,23 @@ async function main() {
 
     let updateResult: any;
 
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    updateResult = await productRepo.unsetUnnecessaryFields({
+    const orderRepo = await chevre.repository.Order.createInstance(mongoose.connection);
+    updateResult = await orderRepo.unsetUnnecessaryFields({
         filter: {
-            'serviceType.project': { $exists: true }
+            additionalProperty: { $exists: true }
         },
         $unset: {
-            'serviceType.project': 1
+            additionalProperty: 1
         }
     });
     console.log('unset processed.', updateResult);
-    updateResult = await productRepo.unsetUnnecessaryFields({
+
+    updateResult = await orderRepo.unsetUnnecessaryFields({
         filter: {
-            provider: { $exists: true }
+            orderNumber: { $exists: true }
         },
         $unset: {
-            provider: 1
+            discounts: 1
         }
     });
     console.log('unset processed.', updateResult);

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

@@ -9,10 +9,7 @@ exports.modelName = modelName;
 const schemaDefinition = {
     broker: mongoose_1.SchemaTypes.Mixed,
     project: mongoose_1.SchemaTypes.Mixed,
-    typeOf: {
-        type: String,
-        required: true
-    },
+    typeOf: { type: String, required: true },
     identifier: [mongoose_1.SchemaTypes.Mixed],
     name: String,
     seller: mongoose_1.SchemaTypes.Mixed,
@@ -24,7 +21,7 @@ const schemaDefinition = {
     priceCurrency: String,
     acceptedOffers: [mongoose_1.SchemaTypes.Mixed],
     paymentMethods: [mongoose_1.SchemaTypes.Mixed],
-    discounts: [mongoose_1.SchemaTypes.Mixed],
+    discounts: mongoose_1.SchemaTypes.Mixed,
     url: String,
     orderStatus: String,
     previousOrderStatus: String,
@@ -455,15 +452,6 @@ const indexes = [
             }
         }
     ],
-    [
-        { additionalProperty: 1, orderDate: -1 },
-        {
-            name: 'searchByAdditionalProperty',
-            partialFilterExpression: {
-                additionalProperty: { $exists: true }
-            }
-        }
-    ],
     [
         { typeOf: 1, orderDate: -1 },
         { name: 'searchByTypeOf' }

package/lib/chevre/repo/order.js

@@ -1016,7 +1016,7 @@ class MongoRepository {
     }
     unsetUnnecessaryFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
-            return this.orderModel.updateMany(params.filter, { $unset: params.$unset })
+            return this.orderModel.updateMany(params.filter, { $unset: params.$unset }, { timestamps: false })
                 .exec();
         });
     }

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

@@ -86,6 +86,9 @@ export declare class MongoRepository {
      */
     findInProgressConfirmationNumberById(params: {
         id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
     }): Promise<string | undefined>;
     /**
      * 取引進行者プロフィールを更新
@@ -209,6 +212,9 @@ export declare class MongoRepository {
     }): Promise<void>;
     saveConfirmationNumberIfNotExist(params: {
         id: string;
+        status: {
+            $in: factory.transactionStatusType[];
+        };
         confirmationNumber: string;
     }): Promise<void>;
     findByIdAndDelete(params: {

package/lib/chevre/repo/transaction.js

@@ -323,8 +323,7 @@ class MongoRepository {
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            const transaction = doc.toObject();
-            return transaction.object.orderNumber;
+            return doc.toObject().object.orderNumber;
         });
     }
     /**
@@ -335,14 +334,13 @@ class MongoRepository {
             const doc = yield this.transactionModel.findOne({
                 _id: { $eq: params.id },
                 typeOf: { $eq: factory.transactionType.PlaceOrder },
-                status: { $eq: factory.transactionStatusType.InProgress }
+                status: { $in: params.status.$in }
             }, { 'object.confirmationNumber': 1 })
                 .exec();
             if (doc === null) {
                 throw new factory.errors.NotFound(this.transactionModel.modelName);
             }
-            const transaction = doc.toObject();
-            return transaction.object.confirmationNumber;
+            return doc.toObject().object.confirmationNumber;
         });
     }
     /**
@@ -742,9 +740,10 @@ class MongoRepository {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.transactionModel.updateOne({
                 _id: { $eq: params.id },
-                status: { $eq: factory.transactionStatusType.InProgress },
+                // status: { $eq: factory.transactionStatusType.InProgress },
+                status: { $in: params.status.$in },
                 'object.confirmationNumber': { $exists: false }
-            }, { 'object.confirmationNumber': params.confirmationNumber })
+            }, { $set: { 'object.confirmationNumber': params.confirmationNumber } })
                 .exec();
         });
     }

package/lib/chevre/service/assetTransaction/reserve/factory.js

@@ -66,10 +66,17 @@ function createPointAward(params) {
 }
 exports.createPointAward = createPointAward;
 function createTicketIdentifier(params) {
-    var _a;
-    return (typeof ((_a = params.ticketedSeat) === null || _a === void 0 ? void 0 : _a.seatNumber) === 'string')
+    var _a, _b, _c, _d;
+    // チケット識別子の規定値を作成
+    let ticketIdentifier = (typeof ((_a = params.ticketedSeat) === null || _a === void 0 ? void 0 : _a.seatNumber) === 'string')
         ? util.format('%s:%s:%s', params.reservationFor.id, params.ticketedSeat.seatSection, params.ticketedSeat.seatNumber)
         : util.format('%s:%s', params.reservationFor.id, params.id);
+    // 指定があれば採用
+    const ticketIdentifierByRequest = (_d = (_c = (_b = params.acceptedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.reservedTicket) === null || _d === void 0 ? void 0 : _d.identifier;
+    if (typeof ticketIdentifierByRequest === 'string' && ticketIdentifierByRequest.length > 0) {
+        ticketIdentifier = ticketIdentifierByRequest;
+    }
+    return ticketIdentifier;
 }
 function createReservedTicket(params) {
     var _a, _b, _c;
@@ -128,6 +135,7 @@ function createReservedTicket(params) {
     const ticketType = createTicketType({ availableOffer: params.availableOffer });
     const issuedBy = createIssuedBy({ acceptedOffer: params.acceptedOffer, availableOffer: params.availableOffer });
     const ticketIdentifier = createTicketIdentifier({
+        acceptedOffer: params.acceptedOffer,
         id: params.id,
         reservationFor: params.reservationFor,
         ticketedSeat

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

@@ -290,13 +290,13 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             switch (typeOf) {
                 case factory.reservationType.BusReservation:
                     const serviceOutputAsBusReservation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined), (reservedTicket !== undefined) ? {
-                        reservedTicket: Object.assign({ typeOf: 'Ticket' }, (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
+                        reservedTicket: Object.assign(Object.assign({ typeOf: 'Ticket' }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
                     } : undefined);
                     itemOfferedServiceOutput = serviceOutputAsBusReservation;
                     break;
                 case factory.reservationType.EventReservation:
                     const serviceOutputAsEventReservation = Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ typeOf }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), (programMembershipUsed !== undefined) ? { programMembershipUsed } : undefined), (Array.isArray(subReservation)) ? { subReservation } : undefined), (reservedTicket !== undefined) ? {
-                        reservedTicket: Object.assign({ typeOf: 'Ticket' }, (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
+                        reservedTicket: Object.assign(Object.assign({ typeOf: 'Ticket' }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof (ticketedSeat === null || ticketedSeat === void 0 ? void 0 : ticketedSeat.typeOf) === 'string') ? { ticketedSeat } : undefined)
                     } : undefined);
                     itemOfferedServiceOutput = serviceOutputAsEventReservation;
                     break;

package/lib/chevre/service/order/placeOrder.js

@@ -92,7 +92,9 @@ function placeOrderWithoutTransaction(params) {
         };
         const action = yield repos.action.start(orderActionAttributes);
         try {
-            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { discounts: [], acceptedOffers: [] }));
+            yield repos.order.createIfNotExist(Object.assign(Object.assign({}, order), { 
+                // discounts: [], // 廃止(2024-04-16~)
+                acceptedOffers: [] }));
         }
         catch (error) {
             try {

package/lib/chevre/service/reserve/cancelReservation.d.ts

@@ -30,7 +30,7 @@ declare function cancelReservation(actionAttributesList: factory.action.cancel.r
 declare function processUnlockOfferRateLimit(params: {
     reservation: {
         reservationNumber: string;
-        reservedTicket: factory.assetTransaction.reserve.IObjectSubReservationReservedTicket;
+        reservedTicket: factory.reservation.ITicket;
     };
     reservationFor: factory.assetTransaction.reserve.IReservationFor;
 }): (repos: {

package/lib/chevre/service/transaction/placeOrderInProgress/confirm.js

@@ -32,6 +32,7 @@ function confirm(params) {
         // 確認番号を事前発行
         yield (0, publishConfirmationNumberIfNotExist_1.publishConfirmationNumberIfNotExist)({
             id: params.id,
+            status: { $in: [factory.transactionStatusType.Confirmed, factory.transactionStatusType.InProgress] },
             object: { orderDate: params.result.order.orderDate }
         })(repos);
         const transaction = yield repos.transaction.findById({

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.d.ts

@@ -1,5 +1,6 @@
 import type { RedisRepository as ConfirmationNumberRepo } from '../../../repo/confirmationNumber';
 import type { MongoRepository as TransactionRepo } from '../../../repo/transaction';
+import * as factory from '../../../factory';
 /**
  * 未発行であれば、注文の確認番号を発行して取引に保管する
  */
@@ -8,6 +9,9 @@ declare function publishConfirmationNumberIfNotExist(params: {
      * 取引ID
      */
     id: string;
+    status: {
+        $in: factory.transactionStatusType[];
+    };
     object: {
         orderDate: Date;
     };

package/lib/chevre/service/transaction/placeOrderInProgress/publishConfirmationNumberIfNotExist.js

@@ -16,8 +16,10 @@ const factory = require("../../../factory");
  */
 function publishConfirmationNumberIfNotExist(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        // 最適化(2023-02-03~)
-        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        let confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+            id: params.id,
+            status: { $in: params.status.$in }
+        });
         // すでに発行済であれば何もしない
         if (typeof confirmationNumber === 'string') {
             return confirmationNumber;
@@ -27,11 +29,14 @@ function publishConfirmationNumberIfNotExist(params) {
         // 取引に存在しなければ保管
         yield repos.transaction.saveConfirmationNumberIfNotExist({
             id: params.id,
+            status: { $in: params.status.$in },
             confirmationNumber
         });
         // 確認番号を取引から再取得
-        // 最適化(2023-02-03~)
-        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({ id: params.id });
+        confirmationNumber = yield repos.transaction.findInProgressConfirmationNumberById({
+            id: params.id,
+            status: { $in: params.status.$in }
+        });
         // 万が一処理が想定通りでない場合confirmationNumberが存在しない
         if (typeof confirmationNumber !== 'string') {
             throw new factory.errors.ServiceUnavailable('transaction.object.confirmationNumber not found');

package/lib/chevre/service/transaction/placeOrderInProgress/result.js

@@ -15,10 +15,12 @@ function createOrder(params) {
     const { paymentMethods, price } = createPaymentMethods({
         authorizePaymentActions: params.authorizePaymentActions
     });
-    const discounts = [];
+    // const discounts: factory.order.IDiscount[] = [];
     const name = (typeof params.transaction.object.name === 'string') ? params.transaction.object.name : undefined;
     const broker = (typeof ((_a = params.transaction.object.broker) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? params.transaction.object.broker : undefined;
-    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, discounts: discounts, confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
+    return Object.assign(Object.assign({ project: params.transaction.project, typeOf: factory.order.OrderType.Order, seller: seller, customer: customer, price: price, priceCurrency: factory.priceCurrency.JPY, paymentMethods: paymentMethods, 
+        // discounts: discounts, // 廃止(2024-04-16~)
+        confirmationNumber: '', orderNumber: params.orderNumber, orderedItem: orderedItems, 
         // acceptedOffers: acceptedOffers,
         url: '', orderStatus: params.orderStatus, orderDate: params.orderDate, identifier: [], isGift: params.isGift }, (typeof name === 'string') ? { name } : undefined), (typeof (broker === null || broker === void 0 ? void 0 : broker.typeOf) === 'string') ? { broker } : undefined);
 }

package/package.json

@@ -10,7 +10,7 @@
   ],
   "dependencies": {
     "@aws-sdk/credential-providers": "3.433.0",
-    "@chevre/factory": "4.367.0-alpha.4",
+    "@chevre/factory": "4.367.0-alpha.6",
     "@cinerino/sdk": "5.17.1",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.29.0-alpha.5"
+  "version": "21.29.0-alpha.7"
 }