npm - @chevre/domain - Versions diffs - 20.0.0-alpha.0 → 20.0.0-alpha.2 - Mend

@chevre/domain 20.0.0-alpha.0 → 20.0.0-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (17) hide show

package/README.md CHANGED Viewed

@@ -1,10 +1,10 @@
 # Chevre Domain Library for Node.js
-[![npm (scoped)](https://img.shields.io/npm/v/@cinerino/domain.svg)](https://www.npmjs.com/package/@cinerino/domain)
-[![CircleCI](https://circleci.com/gh/cinerino/domain.svg?style=svg)](https://circleci.com/gh/cinerino/domain)
-[![Coverage Status](https://coveralls.io/repos/github/cinerino/domain/badge.svg?branch=master)](https://coveralls.io/github/cinerino/domain?branch=master)
-[![Known Vulnerabilities](https://snyk.io/test/github/cinerino/domain/badge.svg)](https://snyk.io/test/github/cinerino/domain)
-[![npm](https://img.shields.io/npm/dm/@cinerino/domain.svg)](https://nodei.co/npm/@cinerino/domain/)
+[![npm (scoped)](https://img.shields.io/npm/v/@chevre/domain.svg)](https://www.npmjs.com/package/@chevre/domain)
+[![CircleCI](https://circleci.com/gh/chevre-jp/domain.svg?style=svg)](https://circleci.com/gh/chevre-jp/domain)
+[![Coverage Status](https://coveralls.io/repos/github/chevre-jp/domain/badge.svg?branch=master)](https://coveralls.io/github/chevre-jp/domain?branch=master)
+[![Known Vulnerabilities](https://snyk.io/test/github/chevre-jp/domain/badge.svg)](https://snyk.io/test/github/chevre-jp/domain)
+[![npm](https://img.shields.io/npm/dm/@chevre/domain.svg)](https://nodei.co/npm/@chevre/domain/)
 Node.js client library for using Chevre backend programming.
@@ -17,38 +17,38 @@ Node.js client library for using Chevre backend programming.
 ## Usage
 ```shell
-npm install @cinerino/domain
+npm install @chevre/domain
 ```
 ### Environment variables
-| Name                             | Required | Value             | Purpose                        |
-| -------------------------------- | -------- | ----------------- | ------------------------------ |
-| `AWS_ACCESS_KEY_ID`              | true     |                   | AWS access key                 |
-| `AWS_SECRET_ACCESS_KEY`          | true     |                   | AWS secret access key          |
-| `CHEVRE_AUTHORIZE_SERVER_DOMAIN` | true     |                   | Chevre credentials             |
-| `CHEVRE_CLIENT_ID`               | true     |                   | Chevre credentials             |
-| `CHEVRE_CLIENT_SECRET`           | true     |                   | Chevre credentials             |
-| `CHEVRE_ENDPOINT`                | true     |                   | Chevre credentials             |
-| `CUSTOM_SEARCH_ENGINE_ID`        | true     |                   | Google Custom Search Engine ID |
-| `COA_ENDPOINT`                   | true     |                   | COA credentilas                |
-| `COA_REFRESH_TOKEN`              | true     |                   | credentilas                    |
-| `DEBUG`                          | false    | cinerino-domain:* | Debug                          |
-| `GOOGLE_API_KEY`                 | true     |                   | Google API Key                 |
-| `INFORM_ORDER_URL`               | false    |                   | Inform Order URLs              |
-| `INFORM_TRANSACTION_URL`         | false    |                   | Inform Transaction URLs        |
-| `LINE_NOTIFY_URL`                | true     |                   | LINE Notify URL                |
-| `LINE_NOTIFY_ACCESS_TOKEN`       | true     |                   | LINE Notify access token       |
-| `SENDGRID_API_KEY`               | true     |                   | SendGrid API key               |
-| `COA_TIMEOUT`                    | false    |                   | Timeout settings               |
-| `GMO_TIMEOUT`                    | false    |                   | Timeout settings               |
-| `MVTK_TIMEOUT`                   | false    |                   | Timeout settings               |
-| `TRIGGER_WEBHOOK_TIMEOUT`        | false    |                   | Timeout settings               |
+| Name                             | Required | Value           | Purpose                        |
+| -------------------------------- | -------- | --------------- | ------------------------------ |
+| `AWS_ACCESS_KEY_ID`              | true     |                 | AWS access key                 |
+| `AWS_SECRET_ACCESS_KEY`          | true     |                 | AWS secret access key          |
+| `CHEVRE_AUTHORIZE_SERVER_DOMAIN` | true     |                 | Chevre credentials             |
+| `CHEVRE_CLIENT_ID`               | true     |                 | Chevre credentials             |
+| `CHEVRE_CLIENT_SECRET`           | true     |                 | Chevre credentials             |
+| `CHEVRE_ENDPOINT`                | true     |                 | Chevre credentials             |
+| `CUSTOM_SEARCH_ENGINE_ID`        | true     |                 | Google Custom Search Engine ID |
+| `COA_ENDPOINT`                   | true     |                 | COA credentilas                |
+| `COA_REFRESH_TOKEN`              | true     |                 | credentilas                    |
+| `DEBUG`                          | false    | chevre-domain:* | Debug                          |
+| `GOOGLE_API_KEY`                 | true     |                 | Google API Key                 |
+| `INFORM_ORDER_URL`               | false    |                 | Inform Order URLs              |
+| `INFORM_TRANSACTION_URL`         | false    |                 | Inform Transaction URLs        |
+| `LINE_NOTIFY_URL`                | true     |                 | LINE Notify URL                |
+| `LINE_NOTIFY_ACCESS_TOKEN`       | true     |                 | LINE Notify access token       |
+| `SENDGRID_API_KEY`               | true     |                 | SendGrid API key               |
+| `COA_TIMEOUT`                    | false    |                 | Timeout settings               |
+| `GMO_TIMEOUT`                    | false    |                 | Timeout settings               |
+| `MVTK_TIMEOUT`                   | false    |                 | Timeout settings               |
+| `TRIGGER_WEBHOOK_TIMEOUT`        | false    |                 | Timeout settings               |
 ## Code Samples
-Code sample are [here](https://github.com/cinerino/domain/tree/master/example).
+Code sample are [here](https://github.com/chevre-jp/domain/tree/master/example).
 ## License

package/example/src/chevre/checkOffersAppliesToMovieTicket.ts CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -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 CHANGED Viewed

@@ -150,7 +150,6 @@ function movieTicket2reservation4invoice(movieTicket, order, paymentMethodType)
     // Orderから対象予約を取得
     const reservationOffer = (_a = order === null || order === void 0 ? void 0 : order.acceptedOffers) === null || _a === void 0 ? void 0 : _a.find((o) => {
         var _a, _b, _c, _d;
-        // let appliesToMovieTicketIdentifier: string | undefined;
         let mvtkUnitPriceSpec;
         // MovieTicket適用単価オファーからidentifierを取り出す
         if (((_a = o.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === factory.priceSpecificationType.CompoundPriceSpecification) {
@@ -183,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 CHANGED Viewed

@@ -30,7 +30,8 @@ function createPrice(params) {
     ];
     return {
         priceCurrency: params.ticketOffer.priceSpecification.priceCurrency,
-        project: params.ticketOffer.priceSpecification.project,
+        // 不要な属性を除外(2022-11-02~)
+        // project: params.ticketOffer.priceSpecification.project,
         typeOf: params.ticketOffer.priceSpecification.typeOf,
         valueAddedTaxIncluded: params.ticketOffer.priceSpecification.valueAddedTaxIncluded,
         priceComponent: priceComponent4reservation
@@ -51,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 = {
@@ -82,12 +83,10 @@ function createPriceSpecsByEventOffer(params) {
     let isAppliesToMovieTicketSpecifiedAsArray = false;
     let appliesToMovieTicketSpecifiedAsArray;
     if (Array.isArray(params.appliesToMovieTicket)) {
-        // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
         isAppliesToMovieTicketSpecifiedAsArray = true;
         appliesToMovieTicketSpecifiedAsArray = params.appliesToMovieTicket;
     }
     else if (typeof ((_a = params.appliesToMovieTicket) === null || _a === void 0 ? void 0 : _a.identifier) === 'string') {
-        // const appliesToMovieTicketIdentifier = params.appliesToMovieTicket?.identifier;
         appliesToMovieTicketSpecifiedAsArray = [params.appliesToMovieTicket];
     }
     // 予約のpriceComponentを必要最低限に最適化
@@ -104,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,
@@ -117,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
@@ -195,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/assetTransaction/reserve/factory.js CHANGED Viewed

@@ -316,15 +316,6 @@ function validateAppliesToMovieTicket(params) {
             }
         }
         // Arrayでないケースは廃止(2022-09-10~)
-        // } else {
-        //     const appliesToMovieTicketTypeOf = priceSpecificationAppliesToMovieTicket?.typeOf;
-        //     if (typeof appliesToMovieTicketTypeOf === 'string') {
-        //         // Arrayでない場合を廃止(2022-08-01~)
-        //         throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
-        //         // if (typeof appliesToMovieTicketIdentifier !== 'string' || appliesToMovieTicketIdentifier.length === 0) {
-        //         //     throw new factory.errors.Argument('appliesToMovieTicket.identifier');
-        //         // }
-        //     }
     }
 }
 exports.validateAppliesToMovieTicket = validateAppliesToMovieTicket;

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

@@ -303,26 +303,30 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             offerWithoutDetail,
             transaction: params.transaction
         });
-        let movieTicketIdentifire;
         const acceptedAppliesToMovieTicket = (_a = offerWithoutDetail.priceSpecification) === null || _a === void 0 ? void 0 : _a.appliesToMovieTicket;
-        if (Array.isArray(acceptedAppliesToMovieTicket)) {
-            // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
-            // no op
-        }
-        else if (typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string') {
-            movieTicketIdentifire = acceptedAppliesToMovieTicket.identifier;
-        }
+        // let movieTicketIdentifire: string | undefined;
+        // if (Array.isArray(acceptedAppliesToMovieTicket)) {
+        //     // throw new factory.errors.NotImplemented('multiple appliesToMovieTicket not implemented');
+        //     // no op
+        // } else if (typeof acceptedAppliesToMovieTicket?.identifier === 'string') {
+        //     movieTicketIdentifire = acceptedAppliesToMovieTicket.identifier;
+        // }
         // 承認アクションオブジェクトのacceptedOfferにappliesToMovieTicketを連携する(2022-08-02~)
         const priceSpecification = Object.assign(Object.assign({}, offer.priceSpecification), (Array.isArray(acceptedAppliesToMovieTicket) || typeof (acceptedAppliesToMovieTicket === null || acceptedAppliesToMovieTicket === void 0 ? void 0 : acceptedAppliesToMovieTicket.identifier) === 'string')
             ? { appliesToMovieTicket: acceptedAppliesToMovieTicket }
             : undefined);
-        const acceptedOffer = Object.assign({
+        const acceptedOffer = {
             // オファーの中身を最適化する(必要最低限の情報のみに)
-            id: String(offer.id), identifier: offer.identifier, priceSpecification,
+            id: String(offer.id),
+            identifier: offer.identifier,
+            priceSpecification,
             // project: offer.project,
-            typeOf: offer.typeOf, priceCurrency: offer.priceCurrency, itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
+            typeOf: offer.typeOf,
+            priceCurrency: offer.priceCurrency,
+            itemOffered: Object.assign({ typeOf: factory.product.ProductType.EventService, serviceOutput: (offerWithoutDetail.itemOffered !== undefined && offerWithoutDetail.itemOffered !== null)
                     ? offerWithoutDetail.itemOffered.serviceOutput
-                    : undefined }, (pointAward !== undefined) ? { pointAward } : undefined), addOn: (Array.isArray(offerWithoutDetail.addOn))
+                    : undefined }, (pointAward !== undefined) ? { pointAward } : undefined),
+            addOn: (Array.isArray(offerWithoutDetail.addOn))
                 ? offerWithoutDetail.addOn.map((a) => {
                     return {
                         project: offer.project,
@@ -331,12 +335,15 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
                         priceCurrency: offer.priceCurrency
                     };
                 })
-                : [],
+                : [],
             // 追加属性をマージ
             additionalProperty: [
                 ...(Array.isArray(offerWithoutDetail.additionalProperty)) ? offerWithoutDetail.additionalProperty : [],
                 ...(Array.isArray(offer.additionalProperty)) ? offer.additionalProperty : []
-            ] }, (typeof movieTicketIdentifire === 'string') ? { movieTicketIdentifire } : undefined);
+            ]
+            // movieTicketIdentifireの不要を確認後に廃止(2022-09-09以降)(2022-11-02+)
+            // ...(typeof movieTicketIdentifire === 'string') ? { movieTicketIdentifire } : undefined
+        };
         let offeredThrough = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredThrough;
         if (typeof (offeredThrough === null || offeredThrough === void 0 ? void 0 : offeredThrough.typeOf) !== 'string') {
             offeredThrough = { typeOf: 'WebAPI', identifier: factory.service.webAPI.Identifier.Chevre };

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

@@ -23,9 +23,8 @@ function createReserveTransactionStartParams(params) {
             }
             else if (typeof ((_b = o.priceSpecification.appliesToMovieTicket) === null || _b === void 0 ? void 0 : _b.identifier) === 'string') {
                 appliesToMovieTicket = { identifier: o.priceSpecification.appliesToMovieTicket.identifier };
-            }
-            else if (typeof o.movieTicketIdentifire === 'string') {
                 // movieTicketIdentifire参照は廃止(2022-09-09~)
+                // } else if (typeof o.movieTicketIdentifire === 'string') {
                 // appliesToMovieTicket = { identifier: o.movieTicketIdentifire };
             }
             return Object.assign(Object.assign(Object.assign({
@@ -192,7 +191,8 @@ function responseBody2acceptedOffers4result(params) {
                 priceSpecification: {
                     priceComponent: priceComponent,
                     priceCurrency: priceSpecification.priceCurrency,
-                    project: priceSpecification.project,
+                    // 不要な属性を除外(2022-11-02~)
+                    // project: priceSpecification.project,
                     typeOf: priceSpecification.typeOf,
                     valueAddedTaxIncluded: priceSpecification.valueAddedTaxIncluded
                 },

package/lib/chevre/service/offer/event/searchEventTicketOffers.js CHANGED Viewed

@@ -72,6 +72,10 @@ function searchScreeningEventTicketOffers(params) {
                 if (priceSpecificationAppliesToMovieTicket.length === 0) {
                     return false;
                 }
+                // 上映方式がなければ除外(2022-11-03~)
+                if (videoFormatTypes.length === 0) {
+                    return false;
+                }
                 return priceSpecificationAppliesToMovieTicket.every((appliesToMovieTicket) => {
                     // すべての上映方式について検証する(2022-10-29~)
                     return videoFormatTypes.every((videoFormat) => {

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

@@ -46,7 +46,8 @@ function createCompoundPriceSpec4event(params) {
         // Arrayでないケースは廃止(2022-09-12~)
     }
     const compoundPriceSpecification = {
-        project: params.offer.project,
+        // 不要な属性を除外(2022-11-02~)
+        // project: params.offer.project,
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
         priceCurrency: factory.priceCurrency.JPY,
         valueAddedTaxIncluded: true,

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

@@ -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/offer/product/searchProductOffers.js CHANGED Viewed

@@ -30,7 +30,8 @@ function searchProductOffers(params) {
             .map((o) => {
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
-                project: productWithOffers.project,
+                // 不要な属性を除外(2022-11-02~)
+                // project: productWithOffers.project,
                 typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
                 priceCurrency: factory.priceCurrency.JPY,
                 valueAddedTaxIncluded: true,

package/lib/chevre/service/offer.js CHANGED Viewed

@@ -41,7 +41,8 @@ function addOffers2Seat(params) {
             });
     }));
     const priceSpecification = {
-        project: params.project,
+        // 不要な属性を除外(2022-11-02~)
+        // project: params.project,
         typeOf: factory.priceSpecificationType.CompoundPriceSpecification,
         priceCurrency: factory.priceCurrency.JPY,
         valueAddedTaxIncluded: true,

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

@@ -90,9 +90,6 @@ function validateMovieTicket(paymentMethodType, transaction) {
 }
 exports.validateMovieTicket = validateMovieTicket;
 function validateAppliesToMovieTicketIdentifiers(params) {
-    // const offeredThroughChevre: boolean =
-    //     params.requiredMovieTicketsByEvent[0]?.serviceOutput.reservationFor.offers?.offeredThrough?.identifier
-    //     === factory.service.webAPI.Identifier.Chevre;
     // 予約の適用identifierと、決済accountIdは番号ごとに枚数が完全一致するはず
     const movieTicketIdentifiers = params.requiredMovieTicketsByEvent.map((t) => t.identifier);
     movieTicketIdentifiers.forEach((movieTicketIdentifier) => {
@@ -154,9 +151,6 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
                     else if (typeof (appliesToMovieTickets4reservation === null || appliesToMovieTickets4reservation === void 0 ? void 0 : appliesToMovieTickets4reservation.identifier) === 'string') {
                         // Arrayでない場合を廃止(2022-08-01~)
                         throw new factory.errors.NotImplemented('appliesToMovieTickets.typeOf as string not implemented');
-                        // if (appliesToMovieTickets4reservation.serviceOutput.typeOf === paymentMethodType) {
-                        //     appliesToMovieTickets4paymentMethod = [appliesToMovieTickets4reservation];
-                        // }
                     }
                     if (Array.isArray(appliesToMovieTickets4paymentMethod) && appliesToMovieTickets4paymentMethod.length > 0) {
                         appliesToMovieTickets4paymentMethod.forEach((appliesToMovieTicket) => {
@@ -182,27 +176,3 @@ function authorizeSeatReservationActions2requiredMovieTickets(params) {
     });
     return requiredMovieTickets;
 }
-// function acceptedOffer2appliesToMovieTicketIdentifier(
-//     acceptedOffer: factory.action.authorize.offer.seatReservation.IResultAcceptedOffer
-// ): string {
-//     let appliesToMovieTicketIdentifier = '';
-//     const unitPriceSpec = <IUnitPriceSpecification | undefined>acceptedOffer.priceSpecification?.priceComponent.find((component) => {
-//         return component.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-//             && (!Array.isArray(component.appliesToAddOn));
-//     });
-//     if (unitPriceSpec === undefined) {
-//         throw new factory.errors.NotFound('UnitPriceSpecification of acceptedOffer');
-//     }
-//     // Chevreの場合は必ず指定されている想定
-//     // 複数決済カード対応(2022-07-11~)
-//     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
-//         if (typeof unitPriceSpec.appliesToMovieTicket[0]?.identifier === 'string') {
-//             appliesToMovieTicketIdentifier = unitPriceSpec.appliesToMovieTicket[0].identifier;
-//         }
-//     } else {
-//         if (typeof unitPriceSpec.appliesToMovieTicket?.identifier === 'string') {
-//             appliesToMovieTicketIdentifier = unitPriceSpec.appliesToMovieTicket.identifier;
-//         }
-//     }
-//     return appliesToMovieTicketIdentifier;
-// }

package/package.json CHANGED Viewed

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.272.0",
-    "@cinerino/sdk": "3.130.0-alpha.0",
+    "@chevre/factory": "4.274.0-alpha.0",
+    "@cinerino/sdk": "3.130.0-alpha.1",
     "@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.0"
+  "version": "20.0.0-alpha.2"
 }