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

package/example/src/chevre/migrateMovieTicketChargePriceSpecs.ts

@@ -35,13 +35,13 @@ async function main() {
             console.log(
                 'appliesToVideoFormat is...',
                 CREATING_VIDEO_FORMAT,
-                priceSpec.project.id, priceSpec.appliesToMovieTicket.serviceType, priceSpec.appliesToVideoFormat, priceSpec.price, i);
+                priceSpec.project?.id, priceSpec.appliesToMovieTicket.serviceType, priceSpec.appliesToVideoFormat, priceSpec.price, i);
         } else {
             // 券種区分について、もうひとつの上映方式に対応する価格仕様が存在しなければ、作成する
             const priceSpecs = await priceSpecRepo.search({
                 limit: 1,
                 page: 1,
-                project: { id: { $eq: priceSpec.project.id } },
+                project: { id: { $eq: project.id } },
                 typeOf: chevre.factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
                 appliesToVideoFormats: [CREATING_VIDEO_FORMAT],
                 appliesToMovieTicket: {
@@ -52,7 +52,7 @@ async function main() {
             if (priceSpec4all !== undefined) {
                 console.log(
                     'already exist.',
-                    priceSpec.project.id, priceSpec.appliesToMovieTicket.serviceType, priceSpec.appliesToVideoFormat, priceSpec.price, i);
+                    priceSpec.project?.id, priceSpec.appliesToMovieTicket.serviceType, priceSpec.appliesToVideoFormat, priceSpec.price, i);
             } else {
                 const newPriceSpec: IMovieTicketPriceSpec = {
                     typeOf: chevre.factory.priceSpecificationType.MovieTicketTypeChargeSpecification,
@@ -67,7 +67,7 @@ async function main() {
 
                 console.log(
                     'creating priceSpec...',
-                    priceSpec.project.id,
+                    priceSpec.project?.id,
                     newPriceSpec.appliesToMovieTicket.serviceType, newPriceSpec.appliesToVideoFormat, newPriceSpec.price, i);
                 await priceSpecRepo.save({
                     attributes: newPriceSpec
@@ -76,7 +76,7 @@ async function main() {
                 updateCount += 1;
                 console.log(
                     'created',
-                    priceSpec.project.id,
+                    priceSpec.project?.id,
                     newPriceSpec.appliesToMovieTicket.serviceType, newPriceSpec.appliesToVideoFormat, newPriceSpec.price, i);
 
             }

package/lib/chevre/service/assetTransaction/registerService/factory.d.ts

@@ -5,7 +5,7 @@ export declare type IUnitPriceSpecification = factory.priceSpecification.IPriceS
  */
 export declare function createPointAward(params: {
     acceptedOffer: factory.assetTransaction.registerService.IAcceptedOfferWithoutDetail;
-    offer: factory.event.screeningEvent.ITicketOffer;
+    offer: factory.product.ITicketOffer;
 }): factory.product.IPointAward | undefined;
 /**
  * サービスアウトプットを作成する
@@ -14,6 +14,6 @@ export declare function createServiceOutput(params: {
     dateIssued: Date;
     product: factory.product.IProduct;
     acceptedOffer: factory.assetTransaction.registerService.IAcceptedOfferWithoutDetail;
-    offer: factory.event.screeningEvent.ITicketOffer;
+    offer: factory.product.ITicketOffer;
     transactionNumber: string;
 }): factory.assetTransaction.registerService.IServiceOutput;

package/lib/chevre/service/assetTransaction/reserve/factory/price.d.ts

@@ -7,7 +7,7 @@ export declare function createPrice(params: {
         id: string;
         typeOf: factory.organizationType.Project;
     };
-    ticketOffer: factory.event.screeningEvent.ITicketOffer;
+    ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: factory.offer.IAddOn[];
     appliesToMovieTicket?: factory.assetTransaction.reserve.IAcceptedAppliesToMovieTicket;

package/lib/chevre/service/assetTransaction/reserve/factory.d.ts

@@ -8,7 +8,7 @@ export declare function createStartParams(params: factory.assetTransaction.reser
  */
 export declare function createPointAward(params: {
     acceptedOffer: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail;
-    offer: factory.event.screeningEvent.ITicketOffer;
+    offer: factory.product.ITicketOffer;
     reservation: {
         id: string;
     };
@@ -22,7 +22,7 @@ export declare function createReservedTicket(params: {
     reservedSeatsOnly: boolean;
     screeningRoomSections?: factory.place.screeningRoomSection.IPlace[];
     availableSeatOffers: factory.place.seat.IPlaceWithOffer[];
-    ticketOffer: factory.event.screeningEvent.ITicketOffer;
+    ticketOffer: factory.product.ITicketOffer;
     transaction: factory.assetTransaction.ITransaction<factory.assetTransactionType.Reserve>;
 }): factory.reservation.ITicket;
 export declare function validateAppliesToMovieTicket(params: {
@@ -58,7 +58,7 @@ export declare function createReservation(params: {
     reservedTicket: factory.reservation.ITicket;
     additionalProperty?: factory.propertyValue.IPropertyValue<string>[];
     additionalTicketText?: string;
-    ticketOffer: factory.event.screeningEvent.ITicketOffer;
+    ticketOffer: factory.product.ITicketOffer;
     seatPriceComponent: factory.place.seat.IPriceComponent[];
     acceptedAddOns: factory.offer.IAddOn[];
     subReservation?: factory.reservation.ISubReservation<factory.reservationType.EventReservation>[];

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

@@ -329,7 +329,7 @@ function acceptedOfferWithoutDetail2acceptedOffer(params) {
             addOn: (Array.isArray(offerWithoutDetail.addOn))
                 ? offerWithoutDetail.addOn.map((a) => {
                     return {
-                        project: offer.project,
+                        // project: offer.project,
                         typeOf: factory.offerType.Offer,
                         id: a.id,
                         priceCurrency: offer.priceCurrency

package/lib/chevre/service/offer/event/factory.d.ts

@@ -20,8 +20,9 @@ export declare function createAuthorizeSeatReservationActionAttributes(params: {
     broker?: factory.reservation.IBroker<factory.reservationType.EventReservation>;
 }): factory.action.authorize.offer.seatReservation.IAttributes<factory.service.webAPI.Identifier.Chevre>;
 export declare function acceptedOffers2amount(params: {
-    acceptedOffers: factory.action.authorize.offer.seatReservation.IResultAcceptedOffer[];
+    acceptedOffers: IResultAcceptedOffer[];
 }): number;
+declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.Chevre>;
     event: factory.event.IEvent<factory.eventType.ScreeningEvent>;
@@ -30,7 +31,7 @@ export declare function responseBody2acceptedOffers4result(params: {
         typeOf: factory.organizationType.Project;
     };
     seller: factory.transaction.placeOrder.ISeller;
-}): factory.action.authorize.offer.seatReservation.IResultAcceptedOffer[];
+}): IResultAcceptedOffer[];
 export declare function coaTicket2offer(params: {
     project: {
         id: string;
@@ -40,3 +41,4 @@ export declare function coaTicket2offer(params: {
     defaultCurrencyType?: factory.categoryCode.ICategoryCode;
     defaultMembershipType?: factory.categoryCode.ICategoryCode;
 }): factory.unitPriceOffer.IUnitPriceOffer;
+export {};

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

@@ -155,8 +155,7 @@ function responseBody2acceptedOffers4result(params) {
     let acceptedOffers4result = [];
     // 予約取引からacceptedOffers4resultを生成する
     if (Array.isArray(params.responseBody.object.subReservation)) {
-        acceptedOffers4result = params.responseBody.object.subReservation
-            .map((itemOffered) => {
+        acceptedOffers4result = params.responseBody.object.subReservation.map((itemOffered) => {
             var _a;
             const reservation = createReservation({ project: params.project, itemOffered, event: params.event });
             // appliesToMovieTicketがArrayでないケースは廃止(2022-09-12~)
@@ -182,7 +181,7 @@ function responseBody2acceptedOffers4result(params) {
                     : undefined);
             });
             return {
-                project: { typeOf: params.project.typeOf, id: params.project.id },
+                // project: { typeOf: params.project.typeOf, id: params.project.id },
                 typeOf: factory.offerType.Offer,
                 id: itemOffered.reservedTicket.ticketType.id,
                 name: itemOffered.reservedTicket.ticketType.name,
@@ -200,7 +199,7 @@ function responseBody2acceptedOffers4result(params) {
                     ? itemOffered.priceCurrency
                     : factory.priceCurrency.JPY,
                 seller: {
-                    project: { typeOf: params.project.typeOf, id: params.project.id },
+                    // project: { typeOf: params.project.typeOf, id: params.project.id },
                     typeOf: params.seller.typeOf,
                     name: (typeof params.seller.name === 'string')
                         ? params.seller.name

package/lib/chevre/service/offer/event/searchEventTicketOffers.d.ts

@@ -72,5 +72,5 @@ export declare function searchEventTicketOffers(params: {
          */
         kbnEisyahousiki: string;
     };
-}): ISearchEventTicketOffersOperation<factory.event.screeningEvent.ITicketOffer[]>;
+}): ISearchEventTicketOffersOperation<factory.product.ITicketOffer[]>;
 export {};

package/lib/chevre/service/offer/eventServiceByCOA/factory.d.ts

@@ -12,6 +12,7 @@ export declare function offers2resultPrice(offers: factory.action.authorize.offe
     price: number;
     requiredPoint: number;
 };
+declare type IResultAcceptedOffer = factory.action.authorize.offer.seatReservation.IResultAcceptedOffer;
 /**
  * COA仮予約結果から注文アイテムを生成する
  */
@@ -22,4 +23,5 @@ export declare function responseBody2acceptedOffers4result(params: {
     seller: factory.transaction.placeOrder.ISeller;
     bookingTime: Date;
     totalPrice: number;
-}): factory.action.authorize.offer.seatReservation.IResultAcceptedOffer[];
+}): IResultAcceptedOffer[];
+export {};

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

@@ -100,14 +100,6 @@ function responseBody2acceptedOffers4result(params) {
         ].join('');
         const reservationNumber = String(updTmpReserveSeatResult.tmpReserveNum);
         const reservationId = `${reservationNumber}-${index.toString()}`;
-        // tslint:disable-next-line:max-line-length
-        // const unitPriceSpec = <factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.UnitPriceSpecification>>
-        //     requestedOffer.priceSpecification.priceComponent.find(
-        //         (spec) => spec.typeOf === factory.priceSpecificationType.UnitPriceSpecification
-        //     );
-        // if (unitPriceSpec === undefined) {
-        //     throw new factory.errors.Argument('Accepted Offer', 'Unit price specification not found');
-        // }
         const workPerformed = {
             project: event.superEvent.workPerformed.project,
             id: event.superEvent.workPerformed.id,
@@ -183,7 +175,7 @@ function responseBody2acceptedOffers4result(params) {
             priceComponent: requestedOffer.priceSpecification.priceComponent
         };
         return {
-            project: { typeOf: event.project.typeOf, id: event.project.id },
+            // project: { typeOf: event.project.typeOf, id: event.project.id },
             typeOf: factory.offerType.Offer,
             id: requestedOffer.id,
             name: requestedOffer.name,
@@ -192,7 +184,7 @@ function responseBody2acceptedOffers4result(params) {
             priceSpecification,
             priceCurrency: factory.priceCurrency.JPY,
             seller: {
-                project: { typeOf: event.project.typeOf, id: event.project.id },
+                // project: { typeOf: event.project.typeOf, id: event.project.id },
                 typeOf: params.seller.typeOf,
                 name: params.seller.name
             }

package/lib/chevre/service/offer/factory.d.ts

@@ -1,12 +1,12 @@
 import * as factory from '../../factory';
 declare type IMovieTicketTypeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.MovieTicketTypeChargeSpecification>;
 declare type ICategoryCodeChargeSpecification = factory.priceSpecification.IPriceSpecification<factory.priceSpecificationType.CategoryCodeChargeSpecification>;
-export declare function createCompoundPriceSpec4event(params: {
+declare function createCompoundPriceSpec4event(params: {
     eligibleQuantity: factory.quantitativeValue.IQuantitativeValue<factory.unitCode.C62>;
     offer: factory.unitPriceOffer.IUnitPriceOffer;
     movieTicketTypeChargeSpecs: IMovieTicketTypeChargeSpecification[];
     videoFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     soundFormatChargeSpecifications: ICategoryCodeChargeSpecification[];
     videoFormatTypes: string[];
-}): factory.event.screeningEvent.ITicketOffer;
-export {};
+}): factory.product.ITicketOffer;
+export { createCompoundPriceSpec4event };

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

@@ -1,25 +1,38 @@
 "use strict";
+var __rest = (this && this.__rest) || function (s, e) {
+    var t = {};
+    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
+        t[p] = s[p];
+    if (s != null && typeof Object.getOwnPropertySymbols === "function")
+        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
+            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
+                t[p[i]] = s[p[i]];
+        }
+    return t;
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.createCompoundPriceSpec4event = void 0;
 const factory = require("../../factory");
 const USE_MULTIPLE_MOVIE_TICKET_CHARGE = process.env.USE_MULTIPLE_MOVIE_TICKET_CHARGE === '1';
+function categoryCodeChargePriceSpec2component(params) {
+    var _a;
+    return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToCategoryCode: params.appliesToCategoryCode }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
+}
+function mvtkChargePriceSpec2component(params) {
+    var _a;
+    return Object.assign({ id: params.id, typeOf: params.typeOf, name: params.name, price: params.price, priceCurrency: params.priceCurrency, valueAddedTaxIncluded: params.valueAddedTaxIncluded, appliesToVideoFormat: params.appliesToVideoFormat, appliesToMovieTicket: params.appliesToMovieTicket }, (typeof ((_a = params.accounting) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string') ? { accounting: params.accounting } : undefined);
+}
 function createCompoundPriceSpec4event(params) {
     // priceSpecificationはマスタ管理の仕様上必ず存在するはず
     if (params.offer.priceSpecification === undefined) {
         throw new factory.errors.NotFound(`priceSpecification of the offer: ${params.offer.id}`);
     }
     const unitPriceSpec = Object.assign(Object.assign({}, params.offer.priceSpecification), { name: params.offer.name });
-    // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
-    const priceComponent = [
-        unitPriceSpec,
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO strictコーディングで最適化
-        ...params.videoFormatChargeSpecifications,
-        ...params.soundFormatChargeSpecifications
-    ];
+    const videoFormatChargeSpecComponents = params.videoFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
+    const soundFormatChargeSpecComponents = params.soundFormatChargeSpecifications.map(categoryCodeChargePriceSpec2component);
+    let mvtkPriceComponents = [];
     // 複数決済カード対応(2022-07-11~)
     if (Array.isArray(unitPriceSpec.appliesToMovieTicket)) {
-        const mvtkSpecs = [];
         unitPriceSpec.appliesToMovieTicket.forEach((appliesToMovieTicket) => {
             // すべての上映方式に該当する加算料金を追加(2022-10-29~)
             if (USE_MULTIPLE_MOVIE_TICKET_CHARGE) {
@@ -29,7 +42,7 @@ function createCompoundPriceSpec4event(params) {
                         && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType
                         && params.videoFormatTypes.includes(s.appliesToVideoFormat);
                 });
-                mvtkSpecs.push(...mvtkSpecs4appliesToMovieTicket);
+                mvtkPriceComponents = mvtkSpecs4appliesToMovieTicket.map(mvtkChargePriceSpec2component);
             }
             else {
                 const mvtkSpec4appliesToMovieTicket = params.movieTicketTypeChargeSpecs.find((s) => {
@@ -38,17 +51,21 @@ function createCompoundPriceSpec4event(params) {
                         && s.appliesToMovieTicket.serviceType === appliesToMovieTicket.serviceType;
                 });
                 if (mvtkSpec4appliesToMovieTicket !== undefined) {
-                    mvtkSpecs.push(mvtkSpec4appliesToMovieTicket);
+                    mvtkPriceComponents = [mvtkChargePriceSpec2component(mvtkSpec4appliesToMovieTicket)];
                 }
             }
         });
-        // tslint:disable-next-line:no-suspicious-comment
-        // TODO strictコーディングで最適化
-        priceComponent.push(...mvtkSpecs);
     }
     else {
         // Arrayでないケースは廃止(2022-09-12~)
     }
+    // 区分加算料金は決済カード適用でも価格要素に含まれるはず(2022-11-02~)
+    const priceComponent = [
+        unitPriceSpec,
+        ...videoFormatChargeSpecComponents,
+        ...soundFormatChargeSpecComponents,
+        ...mvtkPriceComponents
+    ];
     const compoundPriceSpecification = {
         // 不要な属性を除外(2022-11-02~)
         // project: params.offer.project,
@@ -57,6 +74,8 @@ function createCompoundPriceSpec4event(params) {
         valueAddedTaxIncluded: true,
         priceComponent
     };
-    return Object.assign(Object.assign({}, params.offer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
+    // 不要な属性を除外(2022-11-07~)
+    const _a = params.offer, { project } = _a, unitOfferFields4ticketOffer = __rest(_a, ["project"]);
+    return Object.assign(Object.assign({}, unitOfferFields4ticketOffer), { eligibleQuantity: params.eligibleQuantity, priceSpecification: compoundPriceSpecification });
 }
 exports.createCompoundPriceSpec4event = createCompoundPriceSpec4event;

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

@@ -133,14 +133,14 @@ function responseBody2resultAcceptedOffer(params) {
                 })
             };
             return {
-                project: { typeOf: params.project.typeOf, id: params.project.id },
+                // project: { typeOf: params.project.typeOf, id: params.project.id },
                 typeOf: responseBodyObject.typeOf,
                 id: offer.id,
                 name: offer.name,
                 itemOffered,
                 priceSpecification,
                 priceCurrency: offer.priceCurrency,
-                seller: offer.seller
+                seller: { name: offer.seller.name, typeOf: offer.seller.typeOf }
             };
         });
     }

package/lib/chevre/service/offer/product/searchProductOffers.d.ts

@@ -11,4 +11,4 @@ export declare function searchProductOffers(params: {
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.event.screeningEvent.ITicketOffer[]>;
+}) => Promise<factory.product.ITicketOffer[]>;

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

@@ -23,11 +23,8 @@ function searchProductOffers(params) {
         if (typeof offerCatalogId !== 'string') {
             return [];
         }
-        const offers = yield repos.offer.findOffersByOfferCatalogId({
-            offerCatalog: { id: offerCatalogId }
-        });
-        return offers
-            .map((o) => {
+        const offers = yield repos.offer.findOffersByOfferCatalogId({ offerCatalog: { id: offerCatalogId } });
+        return offers.map((o) => {
             const unitSpec = o.priceSpecification;
             const compoundPriceSpecification = {
                 // 不要な属性を除外(2022-11-02~)
@@ -39,7 +36,10 @@ function searchProductOffers(params) {
                     ...(unitSpec !== undefined) ? [unitSpec] : []
                 ]
             };
-            return Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, project: o.project, typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
+            return Object.assign(Object.assign({ additionalProperty: (Array.isArray(o.additionalProperty)) ? o.additionalProperty : [], alternateName: o.alternateName, availability: o.availability, availableAtOrFrom: o.availableAtOrFrom, color: o.color, description: o.description, id: o.id, identifier: o.identifier, itemOffered: o.itemOffered, name: o.name, priceCurrency: o.priceCurrency, 
+                // 不要な属性を除外(2022-11-07~)
+                // project: o.project,
+                typeOf: o.typeOf, priceSpecification: compoundPriceSpecification }, (o.validFrom instanceof Date) ? { validFrom: o.validFrom } : undefined), (o.validThrough instanceof Date) ? { validThrough: o.validThrough } : undefined);
         });
     });
 }

package/lib/chevre/service/offer/product.d.ts

@@ -53,7 +53,7 @@ export declare function search(params: {
 }): (repos: {
     offer: OfferRepo;
     product: ProductRepo;
-}) => Promise<factory.event.screeningEvent.ITicketOffer[]>;
+}) => Promise<factory.product.ITicketOffer[]>;
 export declare type IAuthorizeOfferAction = factory.action.authorize.offer.product.IAction;
 /**
  * サービス(Chevreプロダクト)オファー承認

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.274.0-alpha.3",
-    "@cinerino/sdk": "3.130.0-alpha.5",
+    "@chevre/factory": "4.274.0",
+    "@cinerino/sdk": "3.130.0-alpha.6",
     "@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.3"
+  "version": "20.0.0-alpha.4"
 }