@chevre/domain 23.0.0-alpha.14 → 23.0.0-alpha.15

package/example/src/chevre/roles/removeConsolePermissionIfExists.ts

@@ -9,7 +9,7 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'eventOffers.*'
+        'products.read'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

package/example/src/chevre/roles/removePermissionIfExists.ts

@@ -9,12 +9,7 @@ async function main() {
     const roleRepo = await chevre.repository.Role.createInstance(mongoose.connection);
 
     const permissions = [
-        'tokens',
-        'authorizations.create',
-        'permits.read',
-        'tasks.read',
-        'transactionNumbers.write',
-        'chevre.admin'
+        'admin.sellers.productOffers.*'
     ];
     for (const permission of permissions) {
         const roles = await roleRepo.projectFields(

package/lib/chevre/repo/categoryCode.d.ts

@@ -4,6 +4,19 @@ type IKeyOfProjection = keyof factory.categoryCode.ICategoryCode;
 type IUnset = {
     [key in keyof Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'color' | 'image' | 'paymentMethod'>]?: 1;
 };
+type CategorySetIdentifierExceptMovieTicketType = Exclude<factory.categoryCode.CategorySetIdentifier, factory.categoryCode.CategorySetIdentifier.MovieTicketType>;
+type ICategoryCodeExceptMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: CategorySetIdentifierExceptMovieTicketType;
+    };
+};
+type IMovieTicketType = Pick<factory.categoryCode.ICategoryCode, 'additionalProperty' | 'codeValue' | 'color' | 'id' | 'image' | 'name' | 'project' | 'typeOf' | 'paymentMethod'> & {
+    inCodeSet: {
+        typeOf: 'CategoryCodeSet';
+        identifier: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+    };
+};
 /**
  * 区分リポジトリ
  */
@@ -21,15 +34,38 @@ export declare class CategoryCodeRepo {
      */
     searchByAggregate(conditions: factory.categoryCode.ISearchConditions, inclusion: IKeyOfProjection[]): Promise<factory.categoryCode.ICategoryCode[]>;
     /**
-     * 検索
+     * 区分検索
      */
-    projectFields(params: factory.categoryCode.ISearchConditions, 
+    projectCategoryCodeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet' | 'paymentMethod'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: CategorySetIdentifierExceptMovieTicketType;
+                $in?: CategorySetIdentifierExceptMovieTicketType[];
+            };
+        };
+    }, 
     /**
      * 空の場合無効
      */
     inclusion: IKeyOfProjection[], options?: {
         excludeMovieTicketType?: boolean;
-    }): Promise<(factory.categoryCode.ICategoryCode & {
+    }): Promise<(ICategoryCodeExceptMovieTicketType & {
+        id: string;
+    })[]>;
+    /**
+     * 決済カード区分検索
+     */
+    projectMovieTicketTypeFields(params: Omit<factory.categoryCode.ISearchConditions, 'inCodeSet'> & {
+        inCodeSet?: {
+            identifier?: {
+                $eq?: factory.categoryCode.CategorySetIdentifier.MovieTicketType;
+            };
+        };
+    }, 
+    /**
+     * 空の場合無効
+     */
+    inclusion: IKeyOfProjection[]): Promise<(IMovieTicketType & {
         id: string;
     })[]>;
     save(params: {

package/lib/chevre/repo/categoryCode.js

@@ -219,9 +219,9 @@ class CategoryCodeRepo {
         });
     }
     /**
-     * 検索
+     * 区分検索
      */
-    projectFields(params, 
+    projectCategoryCodeFields(params, 
     /**
      * 空の場合無効
      */
@@ -249,6 +249,37 @@ class CategoryCodeRepo {
                 .exec();
         });
     }
+    /**
+     * 決済カード区分検索
+     */
+    projectMovieTicketTypeFields(params, 
+    /**
+     * 空の場合無効
+     */
+    inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const conditions = CategoryCodeRepo.CREATE_MONGO_CONDITIONS(params);
+            let positiveProjectionFields = AVAILABLE_PROJECT_FIELDS;
+            if (Array.isArray(inclusion) && inclusion.length > 0) {
+                positiveProjectionFields = inclusion.filter((key) => AVAILABLE_PROJECT_FIELDS.includes(key));
+            }
+            const projection = Object.assign({ _id: 0, id: { $toString: '$_id' } }, Object.fromEntries(positiveProjectionFields.map((key) => ([key, 1]))));
+            const query = this.categoryCodeModel.find((conditions.length > 0) ? { $and: conditions } : {}, projection);
+            if (typeof params.limit === 'number' && params.limit > 0) {
+                const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
+                query.limit(params.limit)
+                    .skip(params.limit * (page - 1));
+            }
+            // tslint:disable-next-line:no-single-line-block-comment
+            /* istanbul ignore else */
+            if (params.sort !== undefined) {
+                query.sort(params.sort);
+            }
+            return query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean() // 2024-08-19~
+                .exec();
+        });
+    }
     save(params) {
         return __awaiter(this, void 0, void 0, function* () {
             let savedId;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateOfferToken.d.ts

@@ -0,0 +1,15 @@
+import * as moment from 'moment';
+import * as factory from '../../../../factory';
+declare function validateOfferToken(params: {
+    acceptedDate: moment.Moment;
+    /**
+     * トークン検証済の指定オファー
+     */
+    verifiedOffer: factory.assetTransaction.reserve.IOfferTokenPayload;
+    /**
+     * イベントのアプリケーションオファー設定
+     */
+    makesOfferOnApplication: factory.event.screeningEvent.ISellerMakesOffer;
+    object: factory.assetTransaction.reserve.IObjectWithoutDetail;
+}): () => Promise<void>;
+export { validateOfferToken };

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest/validateOfferToken.js

@@ -0,0 +1,61 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.validateOfferToken = validateOfferToken;
+const moment = require("moment");
+const factory = require("../../../../factory");
+const OFFER_TOKEN_DATE_FORMAT = 'YYYY-MM-DDTHH:mm:ssZ';
+function validateOfferToken(params) {
+    return () => __awaiter(this, void 0, void 0, function* () {
+        var _a, _b, _c, _d;
+        const { acceptedDate, verifiedOffer, makesOfferOnApplication } = params;
+        const applicationIdentifier = (_a = verifiedOffer.availableAtOrFrom) === null || _a === void 0 ? void 0 : _a.identifier;
+        if (typeof applicationIdentifier !== 'string' || applicationIdentifier === '') {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'availableAtOrFrom.identifier must be string');
+        }
+        const applicationIdentifierMustBe = (Array.isArray(makesOfferOnApplication.availableAtOrFrom))
+            ? makesOfferOnApplication.availableAtOrFrom[0].identifier
+            : (_b = makesOfferOnApplication.availableAtOrFrom) === null || _b === void 0 ? void 0 : _b.identifier;
+        if (typeof applicationIdentifierMustBe !== 'string') {
+            throw new factory.errors.NotFound('makesOffer.availableAtOrFrom.identifier');
+        }
+        if (applicationIdentifier !== applicationIdentifierMustBe) {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'availableAtOrFrom.identifier not matched');
+        }
+        let validThroughMoment;
+        let validFromMoment;
+        validThroughMoment = moment(verifiedOffer.validThrough, OFFER_TOKEN_DATE_FORMAT, true);
+        validFromMoment = moment(verifiedOffer.validFrom, OFFER_TOKEN_DATE_FORMAT, true);
+        if (!validThroughMoment.isValid()) {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'invalid validThrough');
+        }
+        if (!validFromMoment.isValid()) {
+            throw new factory.errors.Argument('reservationFor.offers.token', 'invalid validFrom');
+        }
+        if (acceptedDate.isBefore(validFromMoment)) {
+            throw new factory.errors.Argument('reservationFor.offers.token', `the offer id valid from ${validFromMoment}`);
+        }
+        if (acceptedDate.isAfter(validThroughMoment)) {
+            throw new factory.errors.Argument('reservationFor.offers.token', `the offer id valid through ${validThroughMoment}`);
+        }
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO maxValueを検証
+        const maxValue = (_c = verifiedOffer === null || verifiedOffer === void 0 ? void 0 : verifiedOffer.eligibleQuantity) === null || _c === void 0 ? void 0 : _c.maxValue;
+        if (typeof maxValue === 'number') {
+            const numAcceptedOffers = (_d = params.object.acceptedOffer) === null || _d === void 0 ? void 0 : _d.length;
+            if (typeof numAcceptedOffers === 'number' && numAcceptedOffers > 0) {
+                if (numAcceptedOffers > maxValue) {
+                    throw new factory.errors.Argument('reservationFor.id', `Maximum number of offers exceeded`);
+                }
+            }
+        }
+    });
+}

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -13,7 +13,7 @@ exports.validateStartRequest = validateStartRequest;
 const jwt = require("jsonwebtoken");
 const moment = require("moment");
 const factory = require("../../../factory");
-function verifyOfferedByToken(params) {
+function verifyMemberTierToken(params) {
     return __awaiter(this, void 0, void 0, function* () {
         let result;
         const { issuer, secret, token } = params;
@@ -46,6 +46,42 @@ function verifyOfferedByToken(params) {
         return result;
     });
 }
+// async function verifyOfferToken(params: {
+//     token: string;
+//     secret: string;
+//     issuer?: string;
+// }): Promise<factory.assetTransaction.reserve.IOfferTokenPayload> {
+//     let result: factory.assetTransaction.reserve.IOfferTokenPayload;
+//     const { issuer, secret, token } = params;
+//     try {
+//         result = await new Promise<factory.assetTransaction.reserve.IOfferTokenPayload>((resolve, reject) => {
+//             jwt.verify(
+//                 token,
+//                 secret,
+//                 {
+//                     algorithms: ['HS256'],
+//                     issuer
+//                     // ...(Array.isArray(params.audience)) ? { audience: params.audience } : undefined
+//                 },
+//                 (err, decoded: any) => {
+//                     if (err instanceof Error) {
+//                         reject(err);
+//                     } else {
+//                         resolve(decoded);
+//                     }
+//                 });
+//         });
+//     } catch (error) {
+//         // JWTエラーをハンドリング
+//         if (error instanceof jwt.TokenExpiredError) {
+//             throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message} expiredAt:${error.expiredAt}]`);
+//         } else if (error instanceof jwt.JsonWebTokenError) {
+//             throw new factory.errors.Argument('memberOfToken', `invalid token. [${error.message}]`);
+//         }
+//         throw error;
+//     }
+//     return result;
+// }
 function validateStartRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b, _c;
@@ -57,7 +93,7 @@ function validateStartRequest(params) {
             }
             const tokenizedMemberProgramTier = (_c = (_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.offers) === null || _c === void 0 ? void 0 : _c.validForMemberTier;
             yield validateEventOfferPeriod(Object.assign({ event,
-                now, availableAt: { id: params.store.id } }, (typeof (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
+                now, availableAt: { id: params.store.id }, object: params.object }, (typeof (tokenizedMemberProgramTier === null || tokenizedMemberProgramTier === void 0 ? void 0 : tokenizedMemberProgramTier.token) === 'string') ? { tokenizedMemberProgramTier } : undefined))(repos);
         }
         if (params.validateEvent === true) {
             validateEvent({ event, object: params.object });
@@ -120,6 +156,7 @@ function validateMemberTier(params) {
  * イベントのオファー有効期間を検証する
  */
 function validateEventOfferPeriod(params) {
+    // tslint:disable-next-line:cyclomatic-complexity max-func-body-length
     return (repos) => __awaiter(this, void 0, void 0, function* () {
         var _a, _b;
         const { event, availableAt, tokenizedMemberProgramTier } = params;
@@ -185,7 +222,7 @@ function validateEventOfferPeriod(params) {
             if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
                 throw new factory.errors.NotFound('issuer.tokenSecret');
             }
-            const verifiedValidForMemberTier = yield verifyOfferedByToken({
+            const verifiedValidForMemberTier = yield verifyMemberTierToken({
                 secret: issuer.tokenSecret,
                 issuer: issuer.url,
                 token: validForMemberTierToken
@@ -195,6 +232,34 @@ function validateEventOfferPeriod(params) {
                 memberProgramIdentifierMustBe, aggregateOfferIdentifier
             })(repos);
         }
+        // tslint:disable-next-line:no-suspicious-comment
+        // TODO オファートークン検証(2025-10-21~)
+        // const offerTokenIssuer = makesOfferOnApplication.issuedBy?.identifier;
+        // const offerTokenRequired = typeof offerTokenIssuer === 'string';
+        // if (offerTokenRequired) {
+        //     const offerToken = params.object.reservationFor?.offers?.token;
+        //     if (typeof offerToken !== 'string' || offerToken === '') {
+        //         throw new factory.errors.ArgumentNull('object.reservationFor.offers.token');
+        //     }
+        //     const issuer = await repos.issuer.findByIdentifier({
+        //         project: { id: params.event.project.id },
+        //         identifier: offerTokenIssuer
+        //     });
+        //     if (typeof issuer.tokenSecret !== 'string' || issuer.tokenSecret === '') {
+        //         throw new factory.errors.NotFound('issuer.tokenSecret');
+        //     }
+        //     const verifiedOffer = await verifyOfferToken({
+        //         secret: issuer.tokenSecret,
+        //         issuer: issuer.url,
+        //         token: offerToken
+        //     });
+        //     await validateOfferToken({
+        //         acceptedDate,
+        //         verifiedOffer,
+        //         makesOfferOnApplication,
+        //         object: params.object
+        //     })();
+        // }
     });
 }
 /**

package/lib/chevre/service/event.js

@@ -239,7 +239,7 @@ function saveScreeningEventSeries(params) {
             kubunClass: '043'
         });
         debug('kubunNames found.');
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: params.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, ['additionalProperty', 'codeValue']);

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

@@ -53,15 +53,15 @@ function authorize(params) {
                 'superEvent', 'typeOf', 'identifier', 'name'
             ] // optimize(2024-07-18~)
             );
-            const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+            const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
             }, []);
-            const seatingTypes = yield repos.categoryCode.projectFields({
+            const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
             }, []);
-            const videoFormatTypes = yield repos.categoryCode.projectFields({
+            const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
                 project: { id: { $eq: transaction.project.id } },
                 inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
             }, []);

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

@@ -79,15 +79,15 @@ function changeOffers(params) {
             'superEvent', 'typeOf', 'identifier', 'name'
         ] // optimize(2024-07-18~)
         );
-        const availablePaymentMethodTypes = yield repos.categoryCode.projectFields({
+        const availablePaymentMethodTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.PaymentMethodType } }
         }, []);
-        const seatingTypes = yield repos.categoryCode.projectFields({
+        const seatingTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.SeatingType } }
         }, []);
-        const videoFormatTypes = yield repos.categoryCode.projectFields({
+        const videoFormatTypes = yield repos.categoryCode.projectCategoryCodeFields({
             project: { id: { $eq: transaction.project.id } },
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.VideoFormatType } }
         }, []);

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.projectFields({
+                const syncingCategoryCode = (yield repos.categoryCode.projectCategoryCodeFields({
                     limit: 1,
                     page: 1,
                     project: { id: { $eq: params.project.id } },

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

@@ -348,7 +348,7 @@ function createInformCategoryCodeTasks(params, setting) {
     // settings: Settings
     ) => __awaiter(this, void 0, void 0, function* () {
         var _a;
-        const categoryCodes4inform = yield repos.categoryCode.projectFields({
+        const categoryCodes4inform = yield repos.categoryCode.projectCategoryCodeFields({
             id: { $in: params.ids },
             // ひとまずDistributorTypeのみ
             inCodeSet: { identifier: { $eq: factory.categoryCode.CategorySetIdentifier.DistributorType } }

package/package.json

@@ -11,8 +11,8 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "5.1.0-alpha.3",
-    "@cinerino/sdk": "12.5.0-alpha.9",
+    "@chevre/factory": "5.1.0-alpha.4",
+    "@cinerino/sdk": "12.5.0-alpha.17",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.4.0-alpha.1",
     "@sendgrid/client": "8.1.4",
@@ -115,5 +115,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "23.0.0-alpha.14"
+  "version": "23.0.0-alpha.15"
 }

package/example/src/chevre/categoryCode/findCategoryCodes.ts

@@ -1,29 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
-
-    const categoryCodes = await categoryCodeRepo.projectFields(
-        {
-            limit: 100,
-            page: 1,
-            project: { id: { $eq: project.id } },
-            inCodeSet: { identifier: { $eq: chevre.factory.categoryCode.CategorySetIdentifier.MovieTicketType } }
-        },
-        [],
-        { excludeMovieTicketType: false }
-    );
-    // tslint:disable-next-line:no-null-keyword
-    console.dir(categoryCodes.map(({ inCodeSet }) => inCodeSet.identifier), { depth: null });
-}
-
-main()
-    .then()
-    .catch(console.error);