@chevre/domain 22.10.0-alpha.2 → 22.10.0-alpha.4

package/example/src/chevre/issuer/renameIssuerIdentifier.ts

@@ -0,0 +1,61 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../../lib/index';
+
+const NEW_IDENTIFIER = 'DefaultTokenIssuer';
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const issuerRepo = await chevre.repository.Issuer.createInstance(mongoose.connection);
+
+    const cursor = issuerRepo.getCursor(
+        {
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID }
+        },
+        {
+            _id: 1,
+            project: 1,
+            identifier: 1,
+            url: 1,
+            name: 1
+        }
+    );
+    console.log('docs found');
+
+    let i = 0;
+    let updateCount = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const issuer: chevre.factory.issuer.IIssuer = doc.toObject();
+
+        const alreadyMigrated = issuer.identifier === NEW_IDENTIFIER;
+
+        if (alreadyMigrated) {
+            console.log(
+                'already migrated.',
+                issuer.id, issuer.project.id, issuer.identifier, i);
+        } else {
+            console.log(
+                'updating...',
+                issuer.id, issuer.project.id, issuer.identifier, i);
+            await issuerRepo.renameIssuerIdentifier({
+                id: issuer.id,
+                identifier: NEW_IDENTIFIER
+            });
+            updateCount += 1;
+            console.log(
+                'updated.',
+                issuer.id, issuer.project.id, issuer.identifier, i);
+        }
+    });
+
+    console.log(i, 'docs checked');
+    console.log(updateCount, 'docs updated');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/signPayload.ts

@@ -0,0 +1,47 @@
+import * as jwt from 'jsonwebtoken';
+
+async function main(): Promise<any> {
+    const payload = {
+        member: {
+            identifier: '',
+            // member: {
+            //     identifier: '',
+            //     endDate: '',
+            //     startDate: ''
+            // }
+        }
+    };
+
+    const token = await new Promise<string>((resolve, reject) => {
+        // 所有権を暗号化する
+        jwt.sign(
+            payload,
+            '12345qwert',
+            {
+                // algorithm: jwtSetting.algorithm,
+                issuer: 'https://example.com',
+                expiresIn: 1800
+                // subject,
+            },
+            (err, encoded) => {
+                if (err instanceof Error) {
+                    reject(err);
+                } else {
+                    if (typeof encoded !== 'string') {
+                        reject(new Error('cannot be signed unexpectedly'));
+                    } else {
+                        resolve(encoded);
+                    }
+                }
+            }
+        );
+    });
+    // tslint:disable-next-line:no-console
+    console.log(token);
+}
+
+main()
+    // tslint:disable-next-line:no-console
+    .then(console.log)
+    // tslint:disable-next-line:no-console
+    .catch(console.error);

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

@@ -13,6 +13,9 @@ export declare class IssuerRepo {
     saveIssuer(params: IIssuer): Promise<{
         id: string;
     }>;
+    renameIssuerIdentifier(params: Pick<IIssuer, 'id' | 'identifier'>): Promise<{
+        id: string;
+    }>;
     projectPublicFields(params: ISearchConditions): Promise<Pick<IIssuer, 'id' | 'identifier' | 'project' | 'name' | 'url'>[]>;
     findById(params: {
         id: string;

package/lib/chevre/repo/issuer.js

@@ -69,6 +69,20 @@ class IssuerRepo {
             return { id: savedId };
         });
     }
+    renameIssuerIdentifier(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let savedId;
+            let doc;
+            const { id } = params, updateFields = __rest(params, ["id"]);
+            doc = yield this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
+                .exec();
+            savedId = params.id;
+            if (doc === null) {
+                throw new factory.errors.NotFound(this.issuerModel.modelName);
+            }
+            return { id: savedId };
+        });
+    }
     projectPublicFields(params) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;

package/lib/chevre/service/offer/event/authorize/factory.d.ts

@@ -7,6 +7,9 @@ declare function createReserveTransactionStartParams(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
     event: {
         id: string;
+        offers?: {
+            offeredBy?: string;
+        };
     };
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'expires' | 'seller'>;

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

@@ -8,7 +8,7 @@ exports.responseBody2acceptedOffers4result = responseBody2acceptedOffers4result;
 const moment = require("moment");
 const factory = require("../../../../factory");
 function createReserveTransactionStartParams(params) {
-    var _a;
+    var _a, _b;
     const { transaction, transactionNumber } = params;
     const { seller } = transaction;
     const acceptedTicketOffersWithoutDetail = (Array.isArray(params.acceptedOffers))
@@ -48,7 +48,8 @@ function createReserveTransactionStartParams(params) {
         //     }
         // ]
     };
-    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: { id: params.event.id } }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
+    const offeredByToken = (_b = params.event.offers) === null || _b === void 0 ? void 0 : _b.offeredBy;
+    const object = Object.assign({ acceptedOffer: acceptedTicketOffersWithoutDetail, reservationFor: Object.assign({ id: params.event.id }, (typeof offeredByToken === 'string') ? { offers: { offeredBy: offeredByToken } } : undefined) }, (params.broker !== undefined) ? { broker: params.broker } : undefined);
     return {
         project: { typeOf: factory.organizationType.Project, id: params.project.id },
         typeOf: factory.assetTransactionType.Reserve,

package/lib/chevre/service/offer/event/authorize/processStartReserve4chevre.d.ts

@@ -24,7 +24,11 @@ import type { TicketRepo } from '../../../../repo/ticket';
 import { IResultAcceptedOffer } from './factory';
 declare function processStartReserve4chevre(params: {
     acceptedOffers: factory.assetTransaction.reserve.IAcceptedTicketOfferWithoutDetail[];
-    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'>;
+    event: Pick<IMinimizedIndividualEvent<factory.eventType.ScreeningEvent>, 'id'> & {
+        offers?: {
+            offeredBy?: string;
+        };
+    };
     broker?: factory.reservation.IBroker<factory.reservationType>;
     transactionNumber: string;
     transaction: Pick<factory.transaction.ITransaction<factory.transactionType.PlaceOrder>, 'agent' | 'expires' | 'id' | 'project' | 'seller' | 'typeOf'>;

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

@@ -20,12 +20,13 @@ function processStartReserve4chevre(params, options) {
     //     jwt: JWTCredentials;
     // }
     ) => __awaiter(this, void 0, void 0, function* () {
+        var _a;
         const { event, transaction, transactionNumber } = params;
         let acceptedOffers4result = [];
         // 予約取引開始
         const startParams = (0, factory_1.createReserveTransactionStartParams)(Object.assign({ project: transaction.project, 
             // object: <IObjectWithDetail>action.object,
-            acceptedOffers: params.acceptedOffers, event: { id: event.id }, transaction,
+            acceptedOffers: params.acceptedOffers, event: Object.assign({ id: event.id }, (typeof ((_a = event.offers) === null || _a === void 0 ? void 0 : _a.offeredBy) === 'string') ? { offers: { offeredBy: event.offers.offeredBy } } : undefined), transaction,
             transactionNumber }, (params.broker !== undefined) ? { broker: params.broker } : undefined));
         const startParamObject = yield validateObjectWithoutDetail(startParams, { id: params.transaction.id })(repos);
         const startReserveTransactionResult = yield ReserveTransactionService.start(Object.assign(Object.assign({}, startParams), { object: startParamObject, 

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

@@ -82,7 +82,7 @@ function authorize(params, options) {
 }
 function validateCreateRequest(params) {
     return (repos) => __awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
+        var _a, _b, _c;
         const transaction = yield repos.transaction.projectFieldsInProgressById({
             typeOf: factory.transactionType.PlaceOrder,
             id: params.transaction.id
@@ -98,14 +98,8 @@ function validateCreateRequest(params) {
         if (typeof ((_b = params.object.reservationFor) === null || _b === void 0 ? void 0 : _b.id) !== 'string' || params.object.reservationFor.id.length === 0) {
             throw new factory.errors.ArgumentNull('object.reservationFor.id');
         }
-        // discontinue preSearchedEvent(2024-07-17~)
-        // const event = await repos.event.findMinimizedIndividualEventById<factory.eventType.ScreeningEvent>({
-        //     id: params.object.reservationFor.id
-        // });
-        const event = {
-            id: params.object.reservationFor.id,
-            typeOf: factory.eventType.ScreeningEvent // ひとまずfix(2024-07-17~)
-        };
+        const offeredByToken = (_c = params.object.reservationFor.offers) === null || _c === void 0 ? void 0 : _c.offeredBy;
+        const event = Object.assign({ id: params.object.reservationFor.id, typeOf: factory.eventType.ScreeningEvent }, (typeof offeredByToken === 'string') ? { offers: { offeredBy: offeredByToken } } : undefined);
         return { transaction, event };
     });
 }

package/package.json

@@ -113,5 +113,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.10.0-alpha.2"
+  "version": "22.10.0-alpha.4"
 }