@chevre/domain 20.11.0-alpha.3 → 20.11.1

package/example/src/chevre/person/createInformTask.ts

@@ -0,0 +1,77 @@
+// tslint:disable:no-console no-magic-numbers
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+type IPermitOwnershipInfo = chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermitAsGood>;
+
+const project = { id: <string>process.env.PROJECT_ID };
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+
+    const now = new Date();
+
+    const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
+    const newPersonRepo = new chevre.repository.Person({
+        userPoolId: <string>process.env.USERPOOL_ID_NEW
+    });
+    const oldPersonRepo = new chevre.repository.Person({
+        userPoolId: <string>process.env.USERPOOL_ID_OLD
+    });
+
+    const id = 'a7909268-a584-425e-8212-d7d10f344093';
+
+    const profile = await newPersonRepo.findById({
+        userId: id
+    });
+    console.log('profile found');
+
+    let oldUser;
+    const userIdentitiesStr = profile.additionalProperty?.find((p) => p.name === 'identities')?.value;
+    if (typeof userIdentitiesStr === 'string' && userIdentitiesStr.length > 0) {
+        try {
+            const identities = JSON.parse(userIdentitiesStr);
+            if (Array.isArray(identities) && identities.length > 0) {
+                const userIdByIdentities = identities[0].userId;
+                if (typeof userIdByIdentities === 'string' && userIdByIdentities.length > 0) {
+                    // oldUserは必ず存在するはず
+                    oldUser = await oldPersonRepo.findById({ userId: userIdByIdentities });
+                }
+            }
+        } catch (error) {
+            // tslint:disable-next-line:no-console
+            console.error('person2username throwed', error);
+            throw error;
+        }
+    }
+
+    const paymentCardOwnershipInfos = <IPermitOwnershipInfo[]>
+        await ownershipInfoRepo.search({
+            sort: { ownedFrom: chevre.factory.sortType.Ascending },
+            limit: 1,
+            page: 1,
+            project: { id: { $eq: project.id } },
+            ownedFrom: now,
+            ownedThrough: now,
+            ownedBy: { id },
+            typeOfGood: {
+                issuedThrough: { typeOf: { $eq: chevre.factory.product.ProductType.PaymentCard } }
+            }
+        });
+    const paymentCardOwnershipInfo = paymentCardOwnershipInfos.shift();
+    console.log('paymentCard found');
+
+    console.log({
+        id,
+        // ...profile,
+        accountNumber: paymentCardOwnershipInfo?.typeOfGood.identifier,
+        ...oldUser
+    });
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch(console.error);

package/lib/chevre/service/assetTransaction/registerService.js

@@ -120,7 +120,9 @@ function createTransactionObject(params) {
             transactionObject.push({
                 typeOf: factory.offerType.Offer,
                 id: String(offer.id),
-                itemOffered: Object.assign({ project: params.product.project, typeOf: params.product.typeOf, id: String(params.product.id), serviceOutput: serviceOutput }, (pointAward !== undefined) ? { pointAward } : undefined)
+                itemOffered: Object.assign({ 
+                    // project: params.product.project,
+                    typeOf: params.product.typeOf, id: String(params.product.id), serviceOutput: serviceOutput }, (pointAward !== undefined) ? { pointAward } : undefined)
             });
         }
         return transactionObject;

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

@@ -22,7 +22,7 @@ export declare function responseBody2acceptedOffers4result(params: {
     responseBody: factory.action.authorize.offer.seatReservation.IResponseBody<factory.service.webAPI.Identifier.COA>;
     object: factory.action.authorize.offer.seatReservation.IObject<factory.service.webAPI.Identifier.COA>;
     event: IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>;
-    seller: factory.transaction.placeOrder.ISeller;
+    seller: Pick<factory.transaction.placeOrder.ISeller, 'typeOf' | 'name'>;
     bookingTime: Date;
     totalPrice: number;
 }): IResultAcceptedOffer[];

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

@@ -71,11 +71,11 @@ exports.offers2resultPrice = offers2resultPrice;
 function responseBody2acceptedOffers4result(params) {
     const acceptedOffers4result = [];
     const event = params.event;
-    const updTmpReserveSeatResult = params.responseBody;
+    const reservationNumber = String(params.responseBody.tmpReserveNum);
     // 座席仮予約からオファー情報を生成する
     // tslint:disable-next-line:max-func-body-length
-    acceptedOffers4result.push(...updTmpReserveSeatResult.listTmpReserve.map((tmpReserve, index) => {
-        var _a, _b, _c, _d, _e;
+    acceptedOffers4result.push(...params.responseBody.listTmpReserve.map((tmpReserve, index) => {
+        var _a, _b, _c, _d;
         const requestedOffer = params.object.acceptedOffer.find((o) => {
             var _a, _b, _c, _d;
             return ((_d = (_c = (_b = (_a = o.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.reservedTicket) === null || _c === void 0 ? void 0 : _c.ticketedSeat) === null || _d === void 0 ? void 0 : _d.seatNumber) === tmpReserve.seatNum
@@ -84,14 +84,7 @@ function responseBody2acceptedOffers4result(params) {
         if (requestedOffer === undefined) {
             throw new factory.errors.Argument('offers', '要求された供給情報と仮予約結果が一致しません');
         }
-        let coaInfo;
-        if (event.coaInfo !== undefined) {
-            coaInfo = event.coaInfo;
-        }
-        else {
-            const coaInfoProperty = (_a = event.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'coaInfo');
-            coaInfo = (coaInfoProperty !== undefined) ? JSON.parse(coaInfoProperty.value) : undefined;
-        }
+        const coaInfo = event.coaInfo;
         if (coaInfo === undefined) {
             throw new factory.errors.NotFound('Event COA Info');
         }
@@ -100,11 +93,10 @@ function responseBody2acceptedOffers4result(params) {
             coaInfo.theaterCode,
             coaInfo.dateJouei,
             // tslint:disable-next-line:no-magic-numbers
-            (`00000000${updTmpReserveSeatResult.tmpReserveNum}`).slice(-8),
+            (`00000000${reservationNumber}`).slice(-8),
             // tslint:disable-next-line:no-magic-numbers
             (`000${index + 1}`).slice(-3)
         ].join('');
-        const reservationNumber = String(updTmpReserveSeatResult.tmpReserveNum);
         const reservationId = `${reservationNumber}-${index.toString()}`;
         const workPerformed = {
             id: event.superEvent.workPerformed.id,
@@ -159,8 +151,8 @@ function responseBody2acceptedOffers4result(params) {
                 name: requestedOffer.name
             }
         };
-        const additionalProperty = (_c = (_b = requestedOffer.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput) === null || _c === void 0 ? void 0 : _c.additionalProperty;
-        const additionalTicketText = (_e = (_d = requestedOffer.itemOffered) === null || _d === void 0 ? void 0 : _d.serviceOutput) === null || _e === void 0 ? void 0 : _e.additionalTicketText;
+        const additionalProperty = (_b = (_a = requestedOffer.itemOffered) === null || _a === void 0 ? void 0 : _a.serviceOutput) === null || _b === void 0 ? void 0 : _b.additionalProperty;
+        const additionalTicketText = (_d = (_c = requestedOffer.itemOffered) === null || _c === void 0 ? void 0 : _c.serviceOutput) === null || _d === void 0 ? void 0 : _d.additionalTicketText;
         const issuedThrough = {
             typeOf: factory.product.ProductType.EventService,
             id: '',

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

@@ -143,7 +143,7 @@ function createPriceComponent(params) {
                 priceCurrency: factory.priceCurrency.JPY,
                 typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
                 appliesToCategoryCode: [{
-                        project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                        // project: { id: params.project.id, typeOf: factory.organizationType.Project },
                         typeOf: 'CategoryCode',
                         codeValue: String(kbnJoueihousiki === null || kbnJoueihousiki === void 0 ? void 0 : kbnJoueihousiki.kubunCode),
                         inCodeSet: {
@@ -170,7 +170,7 @@ function createPriceComponent(params) {
             priceCurrency: factory.priceCurrency.JPY,
             typeOf: factory.priceSpecificationType.CategoryCodeChargeSpecification,
             appliesToCategoryCode: [{
-                    project: { id: params.project.id, typeOf: factory.organizationType.Project },
+                    // project: { id: params.project.id, typeOf: factory.organizationType.Project },
                     typeOf: 'CategoryCode',
                     codeValue: ticketInfo.spseatKbn,
                     inCodeSet: {
@@ -250,9 +250,6 @@ function validateAcceptedOffers(params) {
     // tslint:disable-next-line:max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        // const offerIds: string[] = (Array.isArray(params.object.acceptedOffer))
-        //     ? [...new Set(params.object.acceptedOffer.map((o) => o.id))]
-        //     : [];
         const theaterCode = String((_a = params.screeningEvent.coaInfo) === null || _a === void 0 ? void 0 : _a.theaterCode);
         const offerIdentifiers = (Array.isArray(params.object.acceptedOffer))
             ? [...new Set((params.object.acceptedOffer).map((o) => {
@@ -262,12 +259,6 @@ function validateAcceptedOffers(params) {
         let availableUnitPriceOffers = [];
         // 指定された単価オファーを検索
         // ticketCodeで検索(2023-03-22~)
-        // if (offerIds.length > 0) {
-        //     availableUnitPriceOffers = await repos.offer.search({
-        //         id: { $in: offerIds },
-        //         project: { id: { $eq: params.project.id } }
-        //     });
-        // }
         if (offerIdentifiers.length > 0) {
             availableUnitPriceOffers = yield repos.offer.search({
                 identifier: { $in: offerIdentifiers },
@@ -320,7 +311,7 @@ function validateAcceptedOffers(params) {
                 name,
                 price,
                 priceSpecification, ticketInfo: Object.assign(Object.assign({}, ticketInfo), { 
-                    // usePointを上書き(2023-03-22~)
+                    // usePointを自動設定(2023-03-22~)
                     usePoint: (typeof usePointValue === 'string') ? Number(usePointValue) : 0, salePrice // COAに渡す販売金額を上書き(2023-03-20~)
                  }), 
                 // 以下属性については単価オファーから読む(2023-03-09~)

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

@@ -353,7 +353,9 @@ function validateAcceptedOffers(params) {
                     ? { description: offerWithoutDetail.itemOffered.pointAward.description }
                     : undefined);
             }
-            const itemOffered = Object.assign({ project: project, typeOf: params.product.typeOf, id: params.product.id, name: params.product.name, serviceOutput: Object.assign(Object.assign(Object.assign({}, (_j = params.product) === null || _j === void 0 ? void 0 : _j.serviceOutput), (_k = offerWithoutDetail.itemOffered) === null || _k === void 0 ? void 0 : _k.serviceOutput), { project: project, 
+            const itemOffered = Object.assign({ 
+                // project: project,
+                typeOf: params.product.typeOf, id: params.product.id, name: params.product.name, serviceOutput: Object.assign(Object.assign(Object.assign({}, (_j = params.product) === null || _j === void 0 ? void 0 : _j.serviceOutput), (_k = offerWithoutDetail.itemOffered) === null || _k === void 0 ? void 0 : _k.serviceOutput), { project: project, 
                     // 発行者は販売者でいったん固定
                     issuedBy: issuedBy, typeOf: factory.permit.PermitType.Permit }) }, (pointAward !== undefined) ? { pointAward } : undefined);
             return Object.assign(Object.assign(Object.assign({}, offerWithoutDetail), offer), { itemOffered, seller: { project: project, typeOf: params.seller.typeOf, id: params.seller.id, name: params.seller.name } });

package/lib/chevre/service/transaction/orderProgramMembership.js

@@ -206,7 +206,7 @@ function processAuthorizeProductOffer(params) {
         const transaction = params.transaction;
         const project = { typeOf: factory.organizationType.Project, id: params.project.id };
         const seller = {
-            project: project,
+            // project: project,
             typeOf: transaction.seller.typeOf,
             id: transaction.seller.id,
             name: transaction.seller.name
@@ -263,11 +263,13 @@ function processAuthorizeProductOffer(params) {
             ? acceptedOffer.itemOffered.name
             : undefined;
         const object = [{
-                project: project,
+                // project: project,
                 typeOf: acceptedProductOffer.typeOf,
                 id: acceptedProductOffer.id,
                 priceCurrency: acceptedProductOffer.priceCurrency,
-                itemOffered: Object.assign({ project: project, typeOf: factory.product.ProductType.MembershipService, id: params.product.id, serviceOutput: Object.assign({ project: project, typeOf: acceptedOffer.itemOffered.typeOf }, (typeof serviceOutputName === 'string') ? { name: serviceOutputName } : undefined) }, (pointAward !== undefined) ? { pointAward } : undefined),
+                itemOffered: Object.assign({ 
+                    // project: project,
+                    typeOf: factory.product.ProductType.MembershipService, id: params.product.id, serviceOutput: Object.assign({ project: project, typeOf: acceptedOffer.itemOffered.typeOf }, (typeof serviceOutputName === 'string') ? { name: serviceOutputName } : undefined) }, (pointAward !== undefined) ? { pointAward } : undefined),
                 seller: seller
             }];
         // メンバーシップオファー承認

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.306.0",
-    "@cinerino/sdk": "3.151.0-alpha.1",
+    "@chevre/factory": "4.307.0",
+    "@cinerino/sdk": "3.151.0",
     "@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.11.0-alpha.3"
+  "version": "20.11.1"
 }