@chevre/domain 21.6.0-alpha.3 → 21.6.0-alpha.5

package/example/src/chevre/createManyEventsIfNotExist.ts

@@ -105,7 +105,6 @@ async function main() {
                 },
                 offers: {
                     typeOf: chevre.factory.offerType.Offer,
-                    priceCurrency: chevre.factory.priceCurrency.JPY,
                     availabilityEnds: moment('2023-06-26T14:20:00.000Z')
                         .toDate(),
                     availabilityStarts: moment('2023-06-23T15:00:00.000Z')
@@ -275,7 +274,6 @@ async function main() {
                 },
                 offers: {
                     typeOf: chevre.factory.offerType.Offer,
-                    priceCurrency: chevre.factory.priceCurrency.JPY,
                     availabilityEnds: moment('2023-06-26T14:20:00.000Z')
                         .toDate(),
                     availabilityStarts: moment('2023-06-23T15:00:00.000Z')

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -4,16 +4,28 @@ import * as mongoose from 'mongoose';
 import { chevre } from '../../../lib/index';
 
 async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const offerRepo = new chevre.repository.Offer(mongoose.connection);
+    const eventRepo = new chevre.repository.Event(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await offerRepo.unsetUnnecessaryFields({
-        filter: { 'category.project': { $exists: true } },
-        $unset: { 'category.project': 1 }
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.acceptedPaymentMethod': { $exists: true } },
+        $unset: { 'offers.acceptedPaymentMethod': 1 }
     });
-    console.log('offers unset', updateResult);
+    console.log('events unset', updateResult);
+
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.project': { $exists: true } },
+        $unset: { 'offers.project': 1 }
+    });
+    console.log('events unset', updateResult);
+
+    updateResult = await eventRepo.unsetUnnecessaryFields({
+        filter: { 'offers.priceCurrency': { $exists: true } },
+        $unset: { 'offers.priceCurrency': 1 }
+    });
+    console.log('events unset', updateResult);
 }
 
 main()

package/lib/chevre/service/assetTransaction/pay/factory.js

@@ -7,7 +7,7 @@ exports.createStartParams = void 0;
 const factory = require("../../../factory");
 // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
 function createStartParams(params) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
     const paymentServiceId = (params.paymentService !== undefined)
         ? String(params.paymentService.id)
         : '';
@@ -57,29 +57,33 @@ function createStartParams(params) {
     }
     const informPaymentParams = createInformPaymentParams({ paymentService: params.paymentService });
     const accountId = (_h = params.object.paymentMethod) === null || _h === void 0 ? void 0 : _h.accountId;
-    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object: {
-            // パラメータから必要なもののみ取り込む
-            accountId: (typeof accountId === 'string') ? accountId : '',
-            paymentMethodId: params.transactionNumber,
-            typeOf: params.paymentServiceType,
-            id: paymentServiceId,
-            onPaymentStatusChanged: { informPayment: informPaymentParams },
-            paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_j = params.object.paymentMethod) === null || _j === void 0 ? void 0 : _j.additionalProperty))
-                    ? (_k = params.object.paymentMethod) === null || _k === void 0 ? void 0 : _k.additionalProperty
-                    : [], name: (typeof ((_l = params.object.paymentMethod) === null || _l === void 0 ? void 0 : _l.name) === 'string')
-                    ? params.object.paymentMethod.name
-                    : paymentMethodType, amount: params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_m = params.object.paymentMethod) === null || _m === void 0 ? void 0 : _m.description) === 'string')
-                ? { description: (_o = params.object.paymentMethod) === null || _o === void 0 ? void 0 : _o.description }
-                : undefined), (totalPaymentDue !== undefined)
-                ? { totalPaymentDue: totalPaymentDue }
-                : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.method) === 'string')
-                ? { method: (_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.method }
-                : undefined), (((_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.creditCard) !== undefined)
-                ? { creditCard: (_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.creditCard }
-                : undefined), (Array.isArray((_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.movieTickets))
-                ? { movieTickets: (_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.movieTickets }
-                : undefined)
-        }, expires: params.expires }, (typeof ((_v = params.location) === null || _v === void 0 ? void 0 : _v.typeOf) === 'string')
+    const creditCardAsPaymentServiceOutputCurrency = (_l = (_k = (_j = params.paymentService) === null || _j === void 0 ? void 0 : _j.serviceOutput) === null || _k === void 0 ? void 0 : _k.amount) === null || _l === void 0 ? void 0 : _l.currency;
+    const object = {
+        // パラメータから必要なもののみ取り込む
+        accountId: (typeof accountId === 'string') ? accountId : '',
+        paymentMethodId: params.transactionNumber,
+        typeOf: params.paymentServiceType,
+        id: paymentServiceId,
+        onPaymentStatusChanged: { informPayment: informPaymentParams },
+        paymentMethod: Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign(Object.assign({ additionalProperty: (Array.isArray((_m = params.object.paymentMethod) === null || _m === void 0 ? void 0 : _m.additionalProperty))
+                ? (_o = params.object.paymentMethod) === null || _o === void 0 ? void 0 : _o.additionalProperty
+                : [], name: (typeof ((_p = params.object.paymentMethod) === null || _p === void 0 ? void 0 : _p.name) === 'string')
+                ? params.object.paymentMethod.name
+                : paymentMethodType, amount: params.amount, paymentMethodId: params.transactionNumber, typeOf: paymentMethodType }, (typeof ((_q = params.object.paymentMethod) === null || _q === void 0 ? void 0 : _q.description) === 'string')
+            ? { description: (_r = params.object.paymentMethod) === null || _r === void 0 ? void 0 : _r.description }
+            : undefined), (totalPaymentDue !== undefined)
+            ? { totalPaymentDue: totalPaymentDue }
+            : undefined), (typeof accountId === 'string') ? { accountId: accountId } : undefined), (typeof ((_s = params.object.paymentMethod) === null || _s === void 0 ? void 0 : _s.method) === 'string')
+            ? { method: (_t = params.object.paymentMethod) === null || _t === void 0 ? void 0 : _t.method }
+            : undefined), (((_u = params.object.paymentMethod) === null || _u === void 0 ? void 0 : _u.creditCard) !== undefined)
+            ? { creditCard: (_v = params.object.paymentMethod) === null || _v === void 0 ? void 0 : _v.creditCard }
+            : undefined), (Array.isArray((_w = params.object.paymentMethod) === null || _w === void 0 ? void 0 : _w.movieTickets))
+            ? { movieTickets: (_x = params.object.paymentMethod) === null || _x === void 0 ? void 0 : _x.movieTickets }
+            : undefined), (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
+            ? { serviceOutput: { amount: { currency: creditCardAsPaymentServiceOutputCurrency } } }
+            : undefined)
+    };
+    return Object.assign({ project: { typeOf: factory.organizationType.Project, id: params.project.id }, transactionNumber: params.transactionNumber, typeOf: factory.assetTransactionType.Pay, agent: params.agent, recipient: params.recipient, object, expires: params.expires }, (typeof ((_y = params.location) === null || _y === void 0 ? void 0 : _y.typeOf) === 'string')
         ? { location: params.location }
         : undefined);
 }

package/lib/chevre/service/assetTransaction/pay/potentialActions.js

@@ -111,6 +111,7 @@ function createPayObject(params) {
     return payObject;
 }
 function createPayObjectServiceOutput(params) {
+    var _a, _b;
     const transaction = params.transaction;
     const paymentMethod = transaction.object.paymentMethod;
     const order = params.order;
@@ -118,7 +119,15 @@ function createPayObjectServiceOutput(params) {
     switch (transaction.object.typeOf) {
         case factory.service.paymentService.PaymentServiceType.FaceToFace:
         case factory.service.paymentService.PaymentServiceType.PaymentCard:
+            break;
         case factory.service.paymentService.PaymentServiceType.CreditCard:
+            // CreditCardIFのカード通貨区分を追加(2023-08-07~)
+            const creditCardAsPaymentServiceOutput = (typeof ((_b = (_a = transaction.object.serviceOutput) === null || _a === void 0 ? void 0 : _a.amount) === null || _b === void 0 ? void 0 : _b.currency) === 'string')
+                ? { amount: { currency: transaction.object.serviceOutput.amount.currency } }
+                : undefined;
+            if (creditCardAsPaymentServiceOutput !== undefined) {
+                paymentServiceOutput = creditCardAsPaymentServiceOutput;
+            }
             break;
         case factory.service.paymentService.PaymentServiceType.MovieTicket:
             const paymentMethodType = paymentMethod === null || paymentMethod === void 0 ? void 0 : paymentMethod.typeOf;
@@ -129,9 +138,7 @@ function createPayObjectServiceOutput(params) {
                     const amount = movieTicket2amount(transaction, movieTicket);
                     const reservation4invoice = movieTicket2reservation4invoice(movieTicket, order, String(paymentMethodType));
                     return Object.assign(Object.assign({ identifier: movieTicket.identifier }, (typeof (amount === null || amount === void 0 ? void 0 : amount.value) === 'number') ? { amount } : undefined), (typeof ((_a = reservation4invoice.priceSpecification) === null || _a === void 0 ? void 0 : _a.typeOf) === 'string')
-                        ? {
-                            serviceOutput: reservation4invoice
-                        }
+                        ? { serviceOutput: reservation4invoice }
                         : undefined);
                 });
             }

package/lib/chevre/service/event.js

@@ -455,14 +455,13 @@ function createScreeningEventFromCOA(params) {
             .toDate();
     }
     const offers = {
-        // 不要なので廃止(2022-12-19~)
-        // project: { typeOf: params.project.typeOf, id: params.project.id },
         typeOf: factory.offerType.Offer,
         offeredThrough: {
             typeOf: 'WebAPI',
             identifier: factory.service.webAPI.Identifier.COA
         },
-        priceCurrency: factory.priceCurrency.JPY,
+        // 廃止(2023-08-07~)
+        // priceCurrency: factory.priceCurrency.JPY,
         itemOffered: {
             serviceOutput: {
                 reservedTicket: {
@@ -605,10 +604,7 @@ function createScreeningEventSeriesFromCOA(params) {
         endDate: endDate,
         startDate: startDate,
         coaInfo,
-        offers: Object.assign({ 
-            // 不要なので廃止(2023-06-09~)
-            // project: { typeOf: params.project.typeOf, id: params.project.id },
-            typeOf: factory.offerType.Offer, priceCurrency: factory.priceCurrency.JPY }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
+        offers: Object.assign({ typeOf: factory.offerType.Offer }, (Array.isArray(unacceptedPaymentMethod)) ? { unacceptedPaymentMethod: unacceptedPaymentMethod } : undefined),
         additionalProperty
     };
 }

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

@@ -80,27 +80,29 @@ function createMovieTicket(params) {
     };
 }
 function createAuthorizeResult(params) {
-    var _a, _b, _c, _d;
+    var _a, _b, _c, _d, _e, _f;
     const payTransactionObject = params.payTransaction.object;
     const totalPaymentDue = (_a = payTransactionObject.paymentMethod) === null || _a === void 0 ? void 0 : _a.totalPaymentDue;
     if (typeof (totalPaymentDue === null || totalPaymentDue === void 0 ? void 0 : totalPaymentDue.typeOf) !== 'string') {
         throw new factory.errors.ServiceUnavailable('payTransaction.object.paymentMethod.totalPaymentDue undefined');
     }
+    const creditCardAsPaymentServiceOutputCurrency = (_c = (_b = payTransactionObject.serviceOutput) === null || _b === void 0 ? void 0 : _b.amount) === null || _c === void 0 ? void 0 : _c.currency;
+    const issuedThrough = Object.assign({ typeOf: payTransactionObject.typeOf, id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : '' }, (typeof creditCardAsPaymentServiceOutputCurrency === 'string')
+        ? { serviceOutput: { amount: { currency: creditCardAsPaymentServiceOutputCurrency } } }
+        : undefined);
     return {
-        accountId: (typeof ((_b = payTransactionObject.paymentMethod) === null || _b === void 0 ? void 0 : _b.accountId) === 'string')
+        accountId: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.accountId) === 'string')
             ? payTransactionObject.paymentMethod.accountId
             : '',
-        amount: params.object.amount,
-        issuedThrough: {
-            typeOf: payTransactionObject.typeOf,
-            id: (typeof payTransactionObject.id === 'string') ? payTransactionObject.id : ''
-        },
+        // 廃止(2023-08-07~)
+        // amount: params.object.amount,
+        issuedThrough,
         paymentMethod: params.object.paymentMethod,
         paymentStatus: factory.paymentStatusType.PaymentDue,
-        paymentMethodId: (typeof ((_c = payTransactionObject.paymentMethod) === null || _c === void 0 ? void 0 : _c.paymentMethodId) === 'string')
+        paymentMethodId: (typeof ((_e = payTransactionObject.paymentMethod) === null || _e === void 0 ? void 0 : _e.paymentMethodId) === 'string')
             ? payTransactionObject.paymentMethod.paymentMethodId
             : '',
-        name: (typeof ((_d = payTransactionObject.paymentMethod) === null || _d === void 0 ? void 0 : _d.name) === 'string')
+        name: (typeof ((_f = payTransactionObject.paymentMethod) === null || _f === void 0 ? void 0 : _f.name) === 'string')
             ? payTransactionObject.paymentMethod.name
             : params.object.paymentMethod,
         totalPaymentDue: totalPaymentDue,

package/package.json

@@ -9,7 +9,7 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.324.0-alpha.0",
+    "@chevre/factory": "4.324.0-alpha.2",
     "@cinerino/sdk": "3.162.2",
     "@motionpicture/coa-service": "9.2.0",
     "@motionpicture/gmo-service": "5.2.0",
@@ -117,5 +117,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "21.6.0-alpha.3"
+  "version": "21.6.0-alpha.5"
 }