@chevre/domain 20.2.0-alpha.45 → 20.2.0-alpha.47

package/example/src/chevre/migrateOwnershipInfos2newUserPool.ts

@@ -55,7 +55,7 @@ async function main() {
     let updateCount = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const ownershipInfo = <chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermit>>doc.toObject();
+        const ownershipInfo = <chevre.factory.ownershipInfo.IOwnershipInfo<chevre.factory.ownershipInfo.IPermitAsGood>>doc.toObject();
 
         const owner = <chevre.factory.person.IPerson>ownershipInfo.ownedBy;
         let iss =

package/example/src/chevre/ownershipInfosCsv2peopleJson.ts

@@ -132,7 +132,7 @@ function findAccount(params: {
     customer: { id: string };
     now: Date;
 }) {
-    return async (): Promise<chevre.factory.ownershipInfo.IPermit | undefined> => {
+    return async (): Promise<chevre.factory.ownershipInfo.IPermitAsGood | undefined> => {
         const ownershipInfoRepo = new chevre.repository.OwnershipInfo(mongoose.connection);
 
         // let accountOwnershipInfos = await search({
@@ -171,7 +171,7 @@ function findAccount(params: {
             // throw new domain.factory.errors.NotFound('accountOwnershipInfos');
         }
 
-        return <chevre.factory.ownershipInfo.IPermit>ownershipInfos[0].typeOfGood;
+        return <chevre.factory.ownershipInfo.IPermitAsGood>ownershipInfos[0].typeOfGood;
     };
 }
 

package/example/src/chevre/searchEventTicketOffers.ts

@@ -24,7 +24,8 @@ async function main() {
     const { ticketOffers } = await chevre.service.offer.event.searchEventTicketOffers({
         event: { id: 'al9ew43f5' },
         onlyValid: true,
-        sort: true
+        sort: true,
+        validateOfferRateLimit: true
         // ...(typeof sellerId === 'string') ? { seller: { id: sellerId } } : undefined,
         // ...(typeof availableAtId === 'string') ? { store: { id: availableAtId } } : undefined
     })({

package/lib/chevre/service/code.d.ts

@@ -23,7 +23,7 @@ export declare function getToken(params: {
 }): (repos: {
     authorization: AuthorizationRepo;
 }) => Promise<IToken>;
-export declare function verifyToken<T = factory.authorization.IObject>(params: {
+export declare function verifyToken(params: {
     project: {
         id: string;
     };
@@ -32,4 +32,4 @@ export declare function verifyToken<T = factory.authorization.IObject>(params: {
     audience?: string[];
 }): (repos: {
     action?: ActionRepo;
-}) => Promise<T>;
+}) => Promise<factory.authorization.IObject>;

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

@@ -5,6 +5,7 @@ const moment = require("moment");
 const factory = require("../../../factory");
 const MAX_OWNED_THROUGH = '3000-01-01T00:00:00Z';
 function createProductOwnershipInfo(params) {
+    var _a, _b;
     let ownershipInfo;
     let ownedThrough;
     // どういう期間でいくらのオファーなのか
@@ -48,9 +49,14 @@ function createProductOwnershipInfo(params) {
         throw new factory.errors.NotFound('Order.acceptedOffers.priceSpecification.referenceQuantity.value');
     }
     const itemOffered = params.acceptedOffer.itemOffered;
-    const typeOfGood = Object.assign(Object.assign({ project: itemOffered.project, identifier: itemOffered.identifier, issuedThrough: itemOffered.issuedThrough, typeOf: itemOffered.typeOf }, (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined
-    // ...(itemOffered.dateIssued !== undefined) ? { dateIssued: itemOffered.dateIssued } : undefined
-    );
+    // 最適化(2023-02-01~)
+    const issuedThrough = (typeof ((_a = itemOffered.issuedThrough) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
+        ? Object.assign({ id: itemOffered.issuedThrough.id, typeOf: itemOffered.issuedThrough.typeOf }, (typeof ((_b = itemOffered.issuedThrough.serviceType) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string')
+            ? { serviceType: itemOffered.issuedThrough.serviceType }
+            : undefined) : undefined;
+    const typeOfGood = Object.assign(Object.assign(Object.assign({ 
+        // project: itemOffered.project, // 最適化(2023-02-01~)
+        identifier: itemOffered.identifier, typeOf: itemOffered.typeOf }, (typeof (issuedThrough === null || issuedThrough === void 0 ? void 0 : issuedThrough.typeOf) === 'string') ? { issuedThrough } : undefined), (itemOffered.validFor !== undefined) ? { validFor: itemOffered.validFor } : undefined), (itemOffered.name !== undefined) ? { name: itemOffered.name } : undefined);
     ownershipInfo = {
         project: params.project,
         typeOf: 'OwnershipInfo',

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

@@ -187,6 +187,12 @@ function validateObjectWithoutDetail(params) {
                         agent: params.project,
                         token: String(programMembershipUsed)
                     })({ action: repos.action });
+                    if (permitOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                        throw new factory.errors.Argument('programMembershipUsed', 'must be OwnershipInfo');
+                    }
+                    if (permitOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                        throw new factory.errors.Argument('programMembershipUsed', 'must be Permit');
+                    }
                     const typeOfGood = permitOwnershipInfo.typeOfGood;
                     const issuedThroughId = (_c = typeOfGood.issuedThrough) === null || _c === void 0 ? void 0 : _c.id;
                     if (typeof issuedThroughId !== 'string' || issuedThroughId.length === 0) {

package/lib/chevre/service/order/onOrderStatusChanged/factory.js

@@ -30,34 +30,31 @@ function getOrderWithToken(params) {
             return params.order;
         }
         // 冗長な個人情報をマスク(最低限の情報に)
-        const customer4orderToken = (params.order.customer.typeOf === factory.organizationType.Organization)
-            ? {
-                id: params.order.customer.id,
-                name: '****',
-                // project: params.order.customer.project,
-                typeOf: params.order.customer.typeOf
-            }
-            : {
-                id: params.order.customer.id,
-                typeOf: params.order.customer.typeOf
-            };
-        const seller4orderToken = {
-            id: params.order.seller.id,
-            // 最適化(2022-11-15~)
-            // project: params.order.seller.project,
-            typeOf: params.order.seller.typeOf
-        };
+        // const customer4orderToken: factory.order.ISimpleCustomer =
+        //     (params.order.customer.typeOf === factory.organizationType.Organization)
+        //         ? {
+        //             id: params.order.customer.id,
+        //             name: '****',
+        //             // project: params.order.customer.project,
+        //             typeOf: params.order.customer.typeOf
+        //         }
+        //         : {
+        //             id: params.order.customer.id,
+        //             typeOf: params.order.customer.typeOf
+        //         };
+        // const seller4orderToken: Omit<factory.order.ISeller, 'name'> = {
+        //     id: params.order.seller.id,
+        //     typeOf: params.order.seller.typeOf
+        // };
+        // 最適化(2023-01-31~)
         const order4token = {
-            // project: params.order.project,
             typeOf: params.order.typeOf,
-            seller: seller4orderToken,
-            customer: customer4orderToken,
-            // IOrderへ移行(2022-11-17~)
-            // confirmationNumber: params.order.confirmationNumber,
-            orderNumber: params.order.orderNumber,
-            price: params.order.price,
-            priceCurrency: params.order.priceCurrency,
-            orderDate: params.order.orderDate
+            // seller: seller4orderToken,
+            // customer: customer4orderToken,
+            orderNumber: params.order.orderNumber
+            // price: params.order.price,
+            // priceCurrency: params.order.priceCurrency,
+            // orderDate: params.order.orderDate
         };
         const token = yield new Promise((resolve, reject) => {
             // 所有権を暗号化する

package/lib/chevre/service/payment/any.js

@@ -288,6 +288,12 @@ function validateFromLocation(params) {
                 agent: { id: params.project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })(repos);
+            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            }
+            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            }
             accountId = paymentCardOwnershipInfo.typeOfGood.identifier;
         }
         return { accountId };

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

@@ -386,6 +386,12 @@ function validateFromLocation(project, fromLocationBeforeStart, issuedThrough) {
                 agent: { id: project.id, typeOf: factory.organizationType.Project },
                 token: fromLocation
             })({ action: repos.action });
+            if (paymentCardOwnershipInfo.typeOf !== 'OwnershipInfo') {
+                throw new factory.errors.Argument('fromLocation', 'must be OwnershipInfo');
+            }
+            if (paymentCardOwnershipInfo.typeOfGood.typeOf !== factory.permit.PermitType.Permit) {
+                throw new factory.errors.Argument('fromLocation', 'must be Permit');
+            }
             fromLocation = {
                 typeOf: paymentCardOwnershipInfo.typeOfGood.typeOf,
                 identifier: paymentCardOwnershipInfo.typeOfGood.identifier,

package/lib/chevre/service/transaction/orderProgramMembership/findPaymentCardPermit.d.ts

@@ -23,4 +23,4 @@ export declare function findPaymentCardPermit(params: {
 }): (repos: {
     ownershipInfo: OwnershipInfoRepo;
     product: ProductRepo;
-}) => Promise<factory.ownershipInfo.IPermit>;
+}) => Promise<factory.ownershipInfo.IPermitAsGood>;

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.284.0-alpha.2",
-    "@cinerino/sdk": "3.136.0",
+    "@chevre/factory": "4.284.0-alpha.4",
+    "@cinerino/sdk": "3.137.0-alpha.2",
     "@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.2.0-alpha.45"
+  "version": "20.2.0-alpha.47"
 }