@chevre/domain 22.2.0-alpha.2 → 22.2.0-alpha.21

package/lib/chevre/service/task/onResourceUpdated/syncCategoryCode.js

@@ -29,7 +29,7 @@ function syncCategoryCode(params) {
         }
         else {
             for (const categoryCodeId of params.ids) {
-                const syncingCategoryCode = (yield repos.categoryCode.search({
+                const syncingCategoryCode = (yield repos.categoryCode.projectFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

package/lib/chevre/service/task/onResourceUpdated.js

@@ -275,7 +275,7 @@ function createInformMovieTasks(params) {
 }
 function createInformProductTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const products4inform = yield repos.product.searchProducts({
+        const products4inform = yield repos.product.projectFields({
             typeOf: { $eq: params.typeOf },
             id: { $in: params.ids }
         }, ['additionalProperty', 'description', 'name', 'productID', 'project', 'typeOf', 'serviceType'], []);
@@ -322,7 +322,7 @@ function createInformProductTasks(params) {
 }
 function createInformCategoryCodeTasks(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        const categoryCodes4inform = yield repos.categoryCode.search({
+        const categoryCodes4inform = yield repos.categoryCode.projectFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }

package/lib/chevre/service/task/publishPaymentUrl.js

@@ -13,9 +13,11 @@ exports.call = void 0;
 const factory = require("../../factory");
 const action_1 = require("../../repo/action");
 const assetTransaction_1 = require("../../repo/assetTransaction");
+const authorization_1 = require("../../repo/authorization");
 const paymentService_1 = require("../../repo/paymentService");
 const paymentServiceProvider_1 = require("../../repo/paymentServiceProvider");
 const sellerPaymentAccepted_1 = require("../../repo/sellerPaymentAccepted");
+const ticket_1 = require("../../repo/ticket");
 const transaction_1 = require("../../repo/transaction");
 const transactionNumber_1 = require("../../repo/transactionNumber");
 const transactionProcess_1 = require("../../repo/transactionProcess");
@@ -38,9 +40,11 @@ function call(params) {
             yield (0, any_1.publishPaymentUrl)(Object.assign(Object.assign({}, params.data), { sameAs: { id: params.id } }))({
                 action: actionRepo,
                 assetTransaction: new assetTransaction_1.AssetTransactionRepo(connection),
+                authorization: new authorization_1.AuthorizationRepo(connection),
                 paymentAccepted: new sellerPaymentAccepted_1.SellerPaymentAcceptedRepo(connection),
                 paymentService: new paymentService_1.PaymentServiceRepo(connection),
                 paymentServiceProvider: new paymentServiceProvider_1.PaymentServiceProviderRepo(connection),
+                ticket: new ticket_1.TicketRepo(connection),
                 transaction: new transaction_1.TransactionRepo(connection),
                 transactionNumber: new transactionNumber_1.TransactionNumberRepo(redisClient)
             }, settings);

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

@@ -28,7 +28,7 @@ const CodeService = require("../code");
 function start(params) {
     return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
         const { passport } = yield repos.passport.validatePassportTokenIfExist(params);
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: params.seller.id }

package/lib/chevre/service/transaction/placeOrder/confirm/validation.d.ts

@@ -41,7 +41,7 @@ export declare function validatePaymentMethods(params: {
  * 興行オファー適用条件確認
  */
 export declare function validateEventOffers(params: {
-    order: factory.transaction.placeOrder.IOrderAsResult;
+    order: Pick<factory.transaction.placeOrder.IOrderAsResult, 'price'>;
     paymentMethods: factory.order.IReferencedInvoice[];
     authorizeEventServiceOfferActions: Pick<IAuthorizeEventServiceOffer, 'id' | 'instrument' | 'object' | 'result'>[];
 }): void;

package/lib/chevre/service/transaction/placeOrder/confirm/validation.js

@@ -350,11 +350,12 @@ exports.validatePaymentMethods = validatePaymentMethods;
 // tslint:disable-next-line:max-func-body-length
 function validateEventOffers(params) {
     var _a, _b;
-    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = params.paymentMethods.find((referenceInvoice) => {
+    const { paymentMethods } = params;
+    const firstCreditCardPaymentMethodIdentifier = (_b = (_a = paymentMethods.find((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     })) === null || _a === void 0 ? void 0 : _a.paymentMethod) === null || _b === void 0 ? void 0 : _b.identifier;
-    const numCreditCardOrFaceToFacePaymentMethod = params.paymentMethods.filter((referenceInvoice) => {
+    const numCreditCardOrFaceToFacePaymentMethod = paymentMethods.filter((referenceInvoice) => {
         return referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.CreditCard
             || referenceInvoice.issuedThrough.typeOf === factory.service.paymentService.PaymentServiceType.FaceToFace;
     }).length;
@@ -411,5 +412,38 @@ function validateEventOffers(params) {
             });
         }
     });
+    // check programMembershipUsed(2024-08-15~)
+    const programMembershipRequired = params.authorizeEventServiceOfferActions.reduce((a, b) => {
+        var _a, _b;
+        const programMembershipUsedfromResult = (_b = (_a = b.result) === null || _a === void 0 ? void 0 : _a.itemOffered) === null || _b === void 0 ? void 0 : _b.serviceOutput.programMembershipUsed;
+        if (Array.isArray(programMembershipUsedfromResult)) {
+            a.push(...programMembershipUsedfromResult);
+        }
+        return a;
+    }, []);
+    const satisfyProgramMembershipRequirement = programMembershipRequired.every(({ identifier, issuedThrough }) => {
+        let satisfyThisRequirement = false;
+        switch (issuedThrough.typeOf) {
+            case factory.product.ProductType.MembershipService:
+                // 検証の必要なし
+                satisfyThisRequirement = true;
+                break;
+            case factory.service.paymentService.PaymentServiceType.CreditCard:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.id === issuedThrough.id
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            case factory.service.paymentService.PaymentServiceType.FaceToFace:
+                satisfyThisRequirement = paymentMethods.some((paymentMethod) => paymentMethod.paymentMethodId === identifier
+                    && paymentMethod.issuedThrough.typeOf === issuedThrough.typeOf);
+                break;
+            default:
+            // no op
+        }
+        return satisfyThisRequirement;
+    });
+    if (!satisfyProgramMembershipRequirement) {
+        throw new factory.errors.Argument('Transaction', `programMembershipUsed requirement not satisfied`);
+    }
 }
 exports.validateEventOffers = validateEventOffers;

package/lib/chevre/service/transaction/placeOrder/confirm.js

@@ -293,7 +293,7 @@ function createResult(params, options) {
         price
     });
     (0, validation_1.validateEventOffers)({
-        order: orderAsResult,
+        order: { price },
         paymentMethods,
         authorizeEventServiceOfferActions: params.authorizeEventServiceOfferActions
     });

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.d.ts

@@ -1,8 +1,8 @@
 import type { MemberRepo } from '../../../../repo/member';
 import type { ProjectMakesOfferRepo } from '../../../../repo/projectMakesOffer';
-import type { SellerRepo } from '../../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../../repo/seller';
 import * as factory from '../../../../factory';
-type ISeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
+type ISeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'typeOf' | 'makesOffer' | 'additionalProperty'>;
 declare function validateStartRequest(params: {
     project: {
         id: string;

package/lib/chevre/service/transaction/placeOrder/start/validateStartRequest.js

@@ -67,7 +67,7 @@ function validateStartRequest(params) {
         if (projectMakesOffer === undefined) {
             throw new factory.errors.Argument('project', 'project makes no offers');
         }
-        const seller = (yield repos.seller.search({
+        const seller = (yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             project: { id: { $eq: params.project.id } },

package/lib/chevre/service/transaction/returnOrder/preStart.d.ts

@@ -7,7 +7,7 @@ import type { OfferItemConditionRepo } from '../../../repo/offerItemCondition';
 import type { OrderRepo } from '../../../repo/order';
 import type { ProjectRepo } from '../../../repo/project';
 import type { ReservationRepo } from '../../../repo/reservation';
-import type { SellerRepo } from '../../../repo/seller';
+import type { ISellerWithId, SellerRepo } from '../../../repo/seller';
 interface IPreStartOperationRepos {
     acceptedOffer: AcceptedOfferRepo;
     event: EventRepo;
@@ -20,7 +20,7 @@ interface IPreStartOperationRepos {
     seller: SellerRepo;
 }
 type IPreStartOperation<T> = (repos: IPreStartOperationRepos) => Promise<T>;
-type IFixedSeller = Pick<factory.seller.ISeller, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
+type IFixedSeller = Pick<ISellerWithId, 'id' | 'name' | 'project' | 'hasMerchantReturnPolicy' | 'typeOf'>;
 /**
  * 返品取引開始前処理
  */

package/lib/chevre/service/transaction/returnOrder/preStart.js

@@ -36,7 +36,7 @@ function preStart(params) {
         const now = new Date();
         const { acceptedOffers, eventIds, offerIds, orders } = yield fixOrders(params)(repos);
         // sellerはorderから自動取得
-        const sellers = yield repos.seller.search({
+        const sellers = yield repos.seller.projectFields({
             limit: 1,
             page: 1,
             id: { $eq: String(orders[0].seller.id) }

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.381.0-alpha.3",
-    "@cinerino/sdk": "10.5.0-alpha.0",
+    "@chevre/factory": "4.381.0-alpha.12",
+    "@cinerino/sdk": "10.7.0-alpha.3",
     "@motionpicture/coa-service": "9.4.0",
     "@motionpicture/gmo-service": "5.3.0",
     "@sendgrid/mail": "6.4.0",
@@ -110,5 +110,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.2.0-alpha.2"
+  "version": "22.2.0-alpha.21"
 }

package/example/src/chevre/searchProducts.ts

@@ -1,28 +0,0 @@
-// tslint:disable:no-implicit-dependencies no-console
-import { chevre } from '../../../lib/index';
-
-import * as  mongoose from 'mongoose';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
-    const products = await productRepo.searchProducts(
-        {
-            project: { id: { $eq: project.id } }
-        },
-        // ['_id', 'typeOf'],
-        [],
-        []
-    );
-    console.log('products:', products);
-    console.log(products.length, 'products found');
-}
-
-main()
-    .then(() => {
-        console.log('success!');
-    })
-    .catch(console.error);