@chevre/domain 22.5.0-alpha.10 → 22.5.0-alpha.11

package/example/src/chevre/findReservationByCode.ts

@@ -32,17 +32,18 @@ async function main() {
             authorization: authorizationRepo,
             order: orderRepo,
             ticket: ticketRepo
-        },
-        {
-            jwt: await chevre.credentials.JWT.createInstance({
-                secret: <string>process.env.TOKEN_SECRET,
-                issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
-                    ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
-                    : [],
-                version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
-                payloadTypPrefix: (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
-            })
         }
+        // {
+        //     jwt: await chevre.credentials.JWT.createInstance({
+        //         secret: <string>process.env.TOKEN_SECRET,
+        //         issuers: (typeof process.env.TOKEN_ISSUERS_BY_AUTHORIZATION === 'string')
+        //             ? process.env.TOKEN_ISSUERS_BY_AUTHORIZATION.split(' ')
+        //             : [],
+        //         version: (typeof process.env.TOKEN_VERSION === 'string') ? process.env.TOKEN_VERSION : '2024-05-02',
+        //         payloadTypPrefix:
+        //             (typeof process.env.TOKEN_PAYLOAD_TYP_PREFIX === 'string') ? process.env.TOKEN_PAYLOAD_TYP_PREFIX : 'chevre'
+        //     })
+        // }
     );
     console.log('verified.');
 

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,30 +6,15 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const creativeWorkRepo = await chevre.repository.CreativeWork.createInstance(mongoose.connection);
-    const offerItemConditionRepo = await chevre.repository.OfferItemCondition.createInstance(mongoose.connection);
+    const productRepo = await chevre.repository.Product.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await creativeWorkRepo.unsetUnnecessaryFields({
+    updateResult = await productRepo.unsetUnnecessaryFields({
         filter: {
-            _id: { $exists: true }
+            'hasOfferCatalog.id': { $exists: true }
         },
-        $unset: <any>{
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await offerItemConditionRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: <any>{
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
+        $unset: {
+            'hasOfferCatalog.id': 1
         }
     });
     console.log(updateResult);

package/lib/chevre/service/reserve/useReservation.d.ts

@@ -19,7 +19,7 @@ export declare function useReservation(params: {
          */
         id: string;
     };
-    instrument?: Pick<factory.action.consume.use.reservation.IInstrument, 'ticketToken' | 'token'>;
+    instrument?: Pick<factory.action.consume.use.reservation.IInstrument, 'ticketToken'>;
     location?: {
         identifier?: string;
     };

package/lib/chevre/service/reserve/useReservation.js

@@ -21,11 +21,11 @@ const debug = createDebug('chevre-domain:service:reserve:useReservation');
 // tslint:disable-next-line:max-func-body-length
 function useReservation(params) {
     return (repos, settings) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b, _c, _d;
+        var _a, _b, _c;
         const now = new Date();
         const reservationId = params.object.id;
         const ticketToken = (_a = params === null || params === void 0 ? void 0 : params.instrument) === null || _a === void 0 ? void 0 : _a.ticketToken;
-        const token = (_b = params === null || params === void 0 ? void 0 : params.instrument) === null || _b === void 0 ? void 0 : _b.token;
+        // const token = params?.instrument?.token;
         // if (params.verifyToken === true) {} // タスク作成前に検証済なので検証不要
         // confirmReservationが間に合わない可能性を考慮する(2023-06-01~)
         yield reserveIfNotYet({ object: params.object })(repos, settings);
@@ -47,9 +47,9 @@ function useReservation(params) {
             typeOf: reservation.typeOf,
             issuedThrough: { id: reservation.issuedThrough.id, typeOf: reservation.issuedThrough.typeOf },
             reservationFor: { id: reservation.reservationFor.id, typeOf: reservation.reservationFor.typeOf },
-            reservedTicket: Object.assign(Object.assign({ typeOf: reservedTicket.typeOf, ticketType: Object.assign({ identifier: reservedTicket.ticketType.identifier, typeOf: reservedTicket.ticketType.typeOf }, (typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined) }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof ((_c = reservedTicket.ticketedSeat) === null || _c === void 0 ? void 0 : _c.typeOf) === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined)
+            reservedTicket: Object.assign(Object.assign({ typeOf: reservedTicket.typeOf, ticketType: Object.assign({ identifier: reservedTicket.ticketType.identifier, typeOf: reservedTicket.ticketType.typeOf }, (typeof reservedTicket.ticketType.id === 'string') ? { id: reservedTicket.ticketType.id } : undefined) }, (typeof reservedTicket.identifier === 'string') ? { identifier: reservedTicket.identifier } : undefined), (typeof ((_b = reservedTicket.ticketedSeat) === null || _b === void 0 ? void 0 : _b.typeOf) === 'string') ? { ticketedSeat: reservedTicket.ticketedSeat } : undefined)
         };
-        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign(Object.assign({}, (typeof token === 'string') ? { token } : undefined), (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), object: [reservationAsObject] }, (typeof ((_d = params.location) === null || _d === void 0 ? void 0 : _d.identifier) === 'string')
+        const actionAttributes = Object.assign({ project: reservation.project, typeOf: factory.actionType.UseAction, agent: params.agent, instrument: Object.assign(Object.assign({}, (typeof ticketToken === 'string') ? { ticketToken } : undefined), { typeOf: factory.action.check.token.ObjectType.Ticket }), object: [reservationAsObject] }, (typeof ((_c = params.location) === null || _c === void 0 ? void 0 : _c.identifier) === 'string')
             ? { location: { typeOf: factory.placeType.Place, identifier: params.location.identifier } }
             : undefined);
         const action = yield repos.action.start(actionAttributes);

package/lib/chevre/service/reserve/verifyToken4reservation.d.ts

@@ -1,4 +1,3 @@
-import type { JWTCredentials } from '../../credentials/jwt';
 import * as factory from '../../factory';
 import type { AuthorizationRepo } from '../../repo/authorization';
 import type { OrderRepo } from '../../repo/order';
@@ -16,10 +15,6 @@ export declare function verifyToken4reservation(params: {
     agent: factory.action.check.token.IAgent;
     reservationId: string;
     ticket: {
-        /**
-         * JWT
-         */
-        token?: string;
         /**
          * 承認コード
          */
@@ -29,6 +24,4 @@ export declare function verifyToken4reservation(params: {
     authorization: AuthorizationRepo;
     order: OrderRepo;
     ticket: TicketRepo;
-}, credentials: {
-    jwt: JWTCredentials;
 }) => Promise<void>;

package/lib/chevre/service/reserve/verifyToken4reservation.js

@@ -10,25 +10,30 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.verifyToken4reservation = void 0;
+// import type { JWTCredentials } from '../../credentials/jwt';
 const factory = require("../../factory");
-const code_1 = require("../code");
+// import { verifyToken } from '../code';
 /**
  * 予約使用のためのチケットトークンを検証する
  */
 function verifyToken4reservation(params) {
-    return (repos, credentials) => __awaiter(this, void 0, void 0, function* () {
+    return (repos
+    // credentials: {
+    //     jwt: JWTCredentials;
+    // }
+    ) => __awaiter(this, void 0, void 0, function* () {
         // JWTと承認コードの両方に対応する(2024-02-28~)
-        const { token, ticketToken } = params.ticket;
+        const { ticketToken } = params.ticket;
         let payload;
-        if (typeof token === 'string' && token.length > 0) {
-            const { authorizedObject } = yield (0, code_1.verifyToken)({
-                project: params.project,
-                agent: params.agent,
-                token
-            })(repos, credentials);
-            payload = authorizedObject;
-        }
-        else if (typeof ticketToken === 'string' && ticketToken.length > 0) {
+        // if (typeof token === 'string' && token.length > 0) {
+        //     const { authorizedObject } = await verifyToken({
+        //         project: params.project,
+        //         agent: params.agent,
+        //         token
+        //     })(repos, credentials);
+        //     payload = authorizedObject;
+        // } else
+        if (typeof ticketToken === 'string' && ticketToken.length > 0) {
             const findValidOneByCodeResult = yield repos.authorization.findValidOneByCode({
                 project: { id: params.project.id },
                 code: ticketToken

package/package.json

@@ -9,8 +9,8 @@
     }
   ],
   "dependencies": {
-    "@chevre/factory": "4.386.0-alpha.3",
-    "@cinerino/sdk": "10.12.0",
+    "@chevre/factory": "4.386.0-alpha.4",
+    "@cinerino/sdk": "10.13.0-alpha.0",
     "@motionpicture/coa-service": "9.5.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.5.0-alpha.10"
+  "version": "22.5.0-alpha.11"
 }