@chevre/domain 20.11.0 → 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/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: {

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.2",
+    "@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"
+  "version": "20.11.1"
 }