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

package/example/src/chevre/checkOffersAppliesToMovieTicket.ts

@@ -33,7 +33,7 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const offer = <chevre.factory.offer.IUnitPriceOffer>doc.toObject();
+        const offer = <chevre.factory.unitPriceOffer.IUnitPriceOffer>doc.toObject();
         const applieToMovieTicket = offer.priceSpecification?.appliesToMovieTicket;
         if (Array.isArray(applieToMovieTicket)) {
             console.log('is Array', offer.project.id, offer.id, i);

package/example/src/chevre/processRegisterMembership.ts

@@ -35,24 +35,6 @@ async function main() {
     const product = products[0];
     console.log(product);
 
-    // オファーカタログ検索
-    // const offerCatalog = await offerRepo.findOfferCatalogById({ id: product.hasOfferCatalog.id });
-    // console.log(offerCatalog);
-
-    // オファー検索
-    // const offers = await offerRepo.offerModel.find(
-    //     { _id: { $in: (offerCatalog.itemListElement).map((e) => e.id) } },
-    //     {
-    //         __v: 0,
-    //         createdAt: 0,
-    //         updatedAt: 0
-    //     }
-    // )
-    //     .exec()
-    //     .then((docs) => docs.map((doc) => doc.toObject()));
-    // console.log(offers);
-    // console.log(offers.length, 'offers found');
-
     const identifier = `CIN${(new Date()).valueOf()}`;
     const transaction = await chevre.service.assetTransaction.registerService.start({
         project: { id: project.id, typeOf: chevre.factory.organizationType.Project },

package/example/src/chevre/processRegisterPaymentCard.ts

@@ -35,24 +35,6 @@ async function main() {
     const product = products[0];
     console.log(product);
 
-    // オファーカタログ検索
-    // const offerCatalog = await offerRepo.findOfferCatalogById({ id: product.hasOfferCatalog.id });
-    // console.log(offerCatalog);
-
-    // オファー検索
-    // const offers = await offerRepo.offerModel.find(
-    //     { _id: { $in: (offerCatalog.itemListElement).map((e) => e.id) } },
-    //     {
-    //         __v: 0,
-    //         createdAt: 0,
-    //         updatedAt: 0
-    //     }
-    // )
-    //     .exec()
-    //     .then((docs) => docs.map((doc) => doc.toObject()));
-    // console.log(offers);
-    // console.log(offers.length, 'offers found');
-
     const transactionNumber = `CIN${(new Date()).valueOf()}`;
     const identifier = transactionNumber;
     const accessCode = '123';

package/lib/chevre/repo/offer.js

@@ -310,17 +310,6 @@ class MongoRepository {
                 : [];
             let offers = [];
             if (sortedOfferIds.length > 0) {
-                // offers = await this.offerModel.find(
-                //     { _id: { $in: sortedOfferIds } },
-                //     {
-                //         __v: 0,
-                //         createdAt: 0,
-                //         updatedAt: 0
-                //     }
-                // )
-                //     .setOptions({ maxTimeMS: 10000 })
-                //     .exec()
-                //     .then((docs) => docs.map((doc) => doc.toObject()));
                 offers = yield this.search({ id: { $in: sortedOfferIds } });
                 // sorting
                 offers = offers.sort((a, b) => sortedOfferIds.indexOf(String(a.id)) - sortedOfferIds.indexOf(String(b.id)));

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -182,16 +182,20 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
         if (Array.isArray(priceComponent)) {
             reservationPrice = priceComponent.reduce((a, b) => a + Number(b.price), 0);
             priceComponents4invoice = priceComponent.map((component) => {
-                var _a, _b;
+                var _a;
+                const accounting = (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
+                    ? { accountsReceivable: component.accounting.accountsReceivable }
+                    : undefined;
                 if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
-                    return Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(component.appliesToAddOn) ? { appliesToAddOn: component.appliesToAddOn } : undefined)), (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.accountsReceivable) === 'number')
-                        ? { accounting: { accountsReceivable: component.accounting.accountsReceivable } }
-                        : undefined);
+                    const appliesToAddOn = (Array.isArray(component.appliesToAddOn))
+                        ? component.appliesToAddOn.map((addOn) => {
+                            return { typeOf: addOn.typeOf };
+                        })
+                        : undefined;
+                    return Object.assign(Object.assign({ typeOf: component.typeOf, price: component.price, referenceQuantity: component.referenceQuantity }, (Array.isArray(appliesToAddOn)) ? { appliesToAddOn } : undefined), (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
                 }
                 else {
-                    return Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof ((_b = component.accounting) === null || _b === void 0 ? void 0 : _b.accountsReceivable) === 'number')
-                        ? { accounting: { accountsReceivable: component.accounting.accountsReceivable } }
-                        : undefined);
+                    return Object.assign({ typeOf: component.typeOf, price: component.price }, (typeof (accounting === null || accounting === void 0 ? void 0 : accounting.accountsReceivable) === 'number') ? { accounting } : undefined);
                 }
             });
         }

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

@@ -52,7 +52,7 @@ function createUnitPriceSpecsAppliedToAddOn(params) {
                 id: acceptedAddOn.itemOffered.id,
                 name: acceptedAddOn.itemOffered.name,
                 productID: acceptedAddOn.itemOffered.productID,
-                project: acceptedAddOn.itemOffered.project,
+                // project: acceptedAddOn.itemOffered.project,
                 typeOf: acceptedAddOn.itemOffered.typeOf
             };
             const appliesToAddOn = {
@@ -103,7 +103,7 @@ function createPriceSpecsByEventOffer(params) {
                 name: priceSpec.name,
                 price: priceSpec.price,
                 priceCurrency: priceSpec.priceCurrency,
-                project: priceSpec.project,
+                // project: priceSpec.project,
                 typeOf: priceSpec.typeOf,
                 appliesToVideoFormat: priceSpec.appliesToVideoFormat,
                 valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded,
@@ -116,7 +116,7 @@ function createPriceSpecsByEventOffer(params) {
                 name: priceSpec.name,
                 price: priceSpec.price,
                 priceCurrency: priceSpec.priceCurrency,
-                project: priceSpec.project,
+                // project: priceSpec.project,
                 typeOf: priceSpec.typeOf,
                 appliesToCategoryCode: priceSpec.appliesToCategoryCode,
                 valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded
@@ -194,5 +194,7 @@ function eventOfferUnitPriceSpec2reservationUnitPriceSpec(params) {
             }
             : undefined);
     }
-    return Object.assign(Object.assign({ name: priceSpec.name, price: priceSpec.price, priceCurrency: priceSpec.priceCurrency, project: priceSpec.project, referenceQuantity: priceSpec.referenceQuantity, typeOf: priceSpec.typeOf, valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded }, (Array.isArray(appliesToMovieTicket)) ? { appliesToMovieTicket } : undefined), (typeof (accounting4reservation === null || accounting4reservation === void 0 ? void 0 : accounting4reservation.typeOf) === 'string') ? { accounting: accounting4reservation } : undefined);
+    return Object.assign(Object.assign({ name: priceSpec.name, price: priceSpec.price, priceCurrency: priceSpec.priceCurrency, 
+        // project: priceSpec.project,
+        referenceQuantity: priceSpec.referenceQuantity, typeOf: priceSpec.typeOf, valueAddedTaxIncluded: priceSpec.valueAddedTaxIncluded }, (Array.isArray(appliesToMovieTicket)) ? { appliesToMovieTicket } : undefined), (typeof (accounting4reservation === null || accounting4reservation === void 0 ? void 0 : accounting4reservation.typeOf) === 'string') ? { accounting: accounting4reservation } : undefined);
 }

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

@@ -281,7 +281,7 @@ function coaTicket2offer(params) {
             }]
         : undefined;
     const unitPriceSpec = {
-        project: { typeOf: factory.organizationType.Project, id: params.project.id },
+        // project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.priceSpecificationType.UnitPriceSpecification,
         price: 0,
         priceCurrency: factory.priceCurrency.JPY,

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

@@ -2,18 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.responseBody2acceptedOffers4result = exports.offers2resultPrice = exports.createAuthorizeSeatReservationActionAttributes = exports.WebAPIIdentifier = void 0;
 const moment = require("moment");
-// import * as COA from '../../../coa';
 const factory = require("../../../factory");
 exports.WebAPIIdentifier = factory.service.webAPI.Identifier;
-// export type IAcceptedOfferWithoutDetail =
-//     factory.action.authorize.offer.seatReservation.IAcceptedOfferWithoutDetail<WebAPIIdentifier.COA> & {
-//         additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
-//         ticketInfo: factory.offer.seatReservation.ICOATicketInfo & {
-//             spseatAdd1: number;
-//             spseatAdd2: number;
-//             spseatKbn: string;
-//         };
-//     };
 function createAuthorizeSeatReservationActionAttributes(params) {
     var _a;
     const transaction = params.transaction;
@@ -68,25 +58,6 @@ function offers2resultPrice(offers) {
     return { price, requiredPoint };
 }
 exports.offers2resultPrice = offers2resultPrice;
-// export function createUpdTmpReserveSeatArgs(params: {
-//     object: factory.action.authorize.offer.seatReservation.IObjectWithoutDetail<WebAPIIdentifier.COA>;
-//     coaInfo: factory.event.screeningEvent.ICOAInfo;
-// }): COA.factory.reserve.IUpdTmpReserveSeatArgs {
-//     return {
-//         theaterCode: params.coaInfo.theaterCode,
-//         dateJouei: params.coaInfo.dateJouei,
-//         titleCode: params.coaInfo.titleCode,
-//         titleBranchNum: params.coaInfo.titleBranchNum,
-//         timeBegin: params.coaInfo.timeBegin,
-//         screenCode: params.coaInfo.screenCode,
-//         listSeat: params.object.acceptedOffer.map((offer) => {
-//             return {
-//                 seatSection: offer.seatSection,
-//                 seatNum: offer.seatNumber
-//             };
-//         })
-//     };
-// }
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
@@ -202,6 +173,15 @@ function responseBody2acceptedOffers4result(params) {
         const reservation = Object.assign(Object.assign(Object.assign({ project: { typeOf: event.project.typeOf, id: event.project.id }, typeOf: factory.reservationType.EventReservation, id: reservationId, issuedThrough: { typeOf: factory.product.ProductType.EventService }, bookingTime: params.bookingTime }, (Array.isArray(additionalProperty)) ? { additionalProperty } : undefined), (typeof additionalTicketText === 'string') ? { additionalTicketText } : undefined), { 
             // numSeats: 1, // 廃止(2022-08-18~)
             reservationFor: reservationFor, reservationNumber: reservationNumber, reservedTicket: reservedTicket });
+        if (requestedOffer.priceSpecification === undefined) {
+            throw new factory.errors.NotFound('acceptedOffer.priceSpecification');
+        }
+        const priceSpecification = {
+            typeOf: requestedOffer.priceSpecification.typeOf,
+            priceCurrency: requestedOffer.priceSpecification.priceCurrency,
+            valueAddedTaxIncluded: requestedOffer.priceSpecification.valueAddedTaxIncluded,
+            priceComponent: requestedOffer.priceSpecification.priceComponent
+        };
         return {
             project: { typeOf: event.project.typeOf, id: event.project.id },
             typeOf: factory.offerType.Offer,
@@ -209,7 +189,7 @@ function responseBody2acceptedOffers4result(params) {
             name: requestedOffer.name,
             itemOffered: reservation,
             offeredThrough: { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.COA },
-            priceSpecification: requestedOffer.priceSpecification,
+            priceSpecification,
             priceCurrency: factory.priceCurrency.JPY,
             seller: {
                 project: { typeOf: event.project.typeOf, id: event.project.id },

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

@@ -12,6 +12,8 @@ function createCompoundPriceSpec4event(params) {
     // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
     const priceComponent = [
         unitPriceSpec,
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO strictコーディングで最適化
         ...params.videoFormatChargeSpecifications,
         ...params.soundFormatChargeSpecifications
     ];
@@ -40,6 +42,8 @@ function createCompoundPriceSpec4event(params) {
                 }
             }
         });
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO strictコーディングで最適化
         priceComponent.push(...mvtkSpecs);
     }
     else {

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

@@ -82,8 +82,7 @@ function responseBody2resultAcceptedOffer(params) {
     let acceptedOffers = [];
     if (Array.isArray(params.responseBody.object)) {
         acceptedOffers = params.responseBody.object.map((responseBodyObject) => {
-            var _a, _b, _c;
-            // const productTypeOf = responseBodyObject.itemOffered?.serviceOutput?.issuedThrough?.typeOf;
+            var _a, _b, _c, _d;
             const serviceOutputIdentifier = (_b = (_a = responseBodyObject.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.identifier;
             if (serviceOutputIdentifier !== undefined && typeof serviceOutputIdentifier !== 'string') {
                 // 基本的にありえないフロー↓
@@ -96,13 +95,50 @@ function responseBody2resultAcceptedOffer(params) {
             if (offer === undefined) {
                 throw new factory.errors.ServiceUnavailable(`Offer ${responseBodyObject.id} from registerService not found`);
             }
+            if (typeof ((_d = offer.priceSpecification) === null || _d === void 0 ? void 0 : _d.typeOf) !== 'string') {
+                throw new factory.errors.NotFound('acceptedOffer.priceSpecification');
+            }
+            const priceSpecification = {
+                typeOf: offer.priceSpecification.typeOf,
+                valueAddedTaxIncluded: offer.priceSpecification.valueAddedTaxIncluded,
+                priceCurrency: offer.priceSpecification.priceCurrency,
+                priceComponent: offer.priceSpecification.priceComponent.map((component) => {
+                    var _a, _b;
+                    if (component.typeOf === factory.priceSpecificationType.UnitPriceSpecification) {
+                        // tslint:disable-next-line:no-unnecessary-local-variable
+                        const unitPriceComponent = Object.assign(Object.assign(Object.assign({ accounting: component.accounting, name: component.name, price: component.price, priceCurrency: component.priceCurrency, referenceQuantity: component.referenceQuantity, typeOf: component.typeOf, valueAddedTaxIncluded: component.valueAddedTaxIncluded }, (Array.isArray(component.appliesToAddOn))
+                            ? { appliesToAddOn: component.appliesToAddOn }
+                            : undefined), (Array.isArray(component.appliesToMovieTicket))
+                            ? { appliesToMovieTicket: component.appliesToMovieTicket }
+                            : undefined), (typeof ((_a = component.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+                            ? {
+                                accounting: Object.assign(Object.assign({ typeOf: component.accounting.typeOf }, (typeof component.accounting.accountsReceivable === 'number')
+                                    ? { accountsReceivable: component.accounting.accountsReceivable }
+                                    : undefined), (typeof ((_b = component.accounting.operatingRevenue) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+                                    ? {
+                                        operatingRevenue: {
+                                            project: component.accounting.operatingRevenue.project,
+                                            typeOf: component.accounting.operatingRevenue.typeOf,
+                                            codeValue: component.accounting.operatingRevenue.codeValue
+                                        }
+                                    }
+                                    : undefined)
+                            }
+                            : undefined);
+                        return unitPriceComponent;
+                    }
+                    else {
+                        return component;
+                    }
+                })
+            };
             return {
                 project: { typeOf: params.project.typeOf, id: params.project.id },
                 typeOf: responseBodyObject.typeOf,
                 id: offer.id,
                 name: offer.name,
                 itemOffered,
-                priceSpecification: offer.priceSpecification,
+                priceSpecification,
                 priceCurrency: offer.priceCurrency,
                 seller: offer.seller
             };

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

@@ -133,14 +133,16 @@ function createMoneyTransferAcceptedOffers(params) {
                 name: `${amountValue} ${currency}`
             };
             acceptedOffers.push({
-                project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+                // 不要なので廃止(2022-11-05~)
+                // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
                 typeOf: factory.offerType.Offer,
                 itemOffered,
                 // ↓いったん廃止(2022-05-17~)
                 // price: authorizeMoneyTansferAction.result.price,
                 priceCurrency: authorizeMoneyTansferAction.result.priceCurrency,
                 seller: {
-                    project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
+                    // 不要なので廃止(2022-11-05~)
+                    // project: { typeOf: params.transaction.project.typeOf, id: params.transaction.project.id },
                     typeOf: params.seller.typeOf,
                     name: params.seller.name
                 }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.273.1",
-    "@cinerino/sdk": "3.130.0-alpha.1",
+    "@chevre/factory": "4.274.0-alpha.3",
+    "@cinerino/sdk": "3.130.0-alpha.5",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
     "@sendgrid/mail": "6.4.0",
@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.0.0-alpha.1"
+  "version": "20.0.0-alpha.3"
 }