@chevre/domain 22.2.0-alpha.9 → 22.2.0

package/example/src/chevre/createProject.ts

@@ -0,0 +1,19 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+    const result = await projectRepo.createById({
+        id: 'xxx',
+        typeOf: chevre.factory.organizationType.Project
+    });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(result, { depth: null });
+}
+
+main()
+    .then(console.log)
+    .catch(console.error);

package/example/src/chevre/findValidAuthorization.ts

@@ -31,8 +31,7 @@ async function main() {
         code: CODE,
         expiresIn: 18000,
         issuer: 'https://example.com',
-        audience: 'https://example.com',
-        useJti: true
+        audience: 'https://example.com'
     })(
         {
             authorization: authorizationRepo,

package/example/src/chevre/migrateDeleteTransactionTasks.ts

@@ -68,7 +68,7 @@ async function main() {
                 deleteTransactionTask.project.id, deleteTransactionTask.name, deleteTransactionTask.id, deleteTransactionTask.runsAt,
                 placeOrderTransactionId
             );
-            const placeOrderTransaction = (await transactionRepo.search({
+            const placeOrderTransaction = (await transactionRepo.projectFields({
                 limit: 1,
                 page: 1,
                 typeOf: chevre.factory.transactionType.PlaceOrder,

package/example/src/chevre/{migrateMovieTheaterAdditionalProperties.ts → migrateRoomAdditionalProperties.ts}

@@ -16,7 +16,7 @@ async function main() {
 
     const cursor = placeRepo.getCursor(
         {
-            typeOf: { $eq: chevre.factory.placeType.MovieTheater }
+            typeOf: { $eq: chevre.factory.placeType.ScreeningRoom }
             // 'project.id': { $eq: project.id },
             // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
         },
@@ -37,30 +37,30 @@ async function main() {
     let i = 0;
     await cursor.eachAsync(async (doc) => {
         i += 1;
-        const movieTheater: chevre.factory.place.movieTheater.IPlace = doc.toObject();
+        const screeningRoom: chevre.factory.place.screeningRoom.IPlace = doc.toObject();
 
-        const additionalPropertyNamesOnResource = (Array.isArray(movieTheater.additionalProperty))
-            ? movieTheater.additionalProperty?.map((p) => p.name)
+        const additionalPropertyNamesOnResource = (Array.isArray(screeningRoom.additionalProperty))
+            ? screeningRoom.additionalProperty?.map((p) => p.name)
             : [];
         if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
             console.log(
                 additionalPropertyNamesOnResource.join(','),
                 additionalPropertyNamesOnResource.length,
                 'additionalPropertyNamesOnResource found',
-                movieTheater.project.id,
-                movieTheater.branchCode
+                screeningRoom.project.id,
+                screeningRoom.branchCode
             );
             additionalPropertyNames.push(...additionalPropertyNamesOnResource);
-            projectIds.push(movieTheater.project.id);
+            projectIds.push(screeningRoom.project.id);
             additionalPropertyNamesOnResource.forEach((name) => {
                 if (!name.match(/^[a-zA-Z]*$/)) {
                     // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
-                    unexpextedprojectIds.push(movieTheater.project.id);
+                    unexpextedprojectIds.push(screeningRoom.project.id);
                 }
                 // tslint:disable-next-line:no-magic-numbers
                 if (name.length < 5) {
                     // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
-                    unexpextedprojectIds.push(movieTheater.project.id);
+                    unexpextedprojectIds.push(screeningRoom.project.id);
                 }
             });
 
@@ -68,19 +68,19 @@ async function main() {
                 checked += 1;
                 const existingAdditionalProperties = await additionalPropertyRepo.search({
                     limit: 1,
-                    project: { id: { $eq: movieTheater.project.id } },
+                    project: { id: { $eq: screeningRoom.project.id } },
                     codeValue: { $eq: additionalPropertyNameOnResource },
-                    inCodeSet: { identifier: { $eq: movieTheater.typeOf } }
+                    inCodeSet: { identifier: { $eq: screeningRoom.typeOf } }
                 });
                 if (existingAdditionalProperties.length === 0) {
                     const additionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
-                        project: movieTheater.project,
+                        project: screeningRoom.project,
                         // id?: string;
                         typeOf: 'CategoryCode',
                         codeValue: additionalPropertyNameOnResource,
                         inCodeSet: {
                             typeOf: 'CategoryCodeSet',
-                            identifier: movieTheater.typeOf
+                            identifier: screeningRoom.typeOf
                         },
                         name: { ja: additionalPropertyNameOnResource }
                     };
@@ -89,15 +89,15 @@ async function main() {
                     console.log(
                         'additionalProerty created',
                         additionalPropertyNameOnResource,
-                        movieTheater.project.id,
-                        movieTheater.branchCode
+                        screeningRoom.project.id,
+                        screeningRoom.branchCode
                     );
                 } else {
                     console.log(
                         'additionalProerty existed',
                         additionalPropertyNameOnResource,
-                        movieTheater.project.id,
-                        movieTheater.branchCode
+                        screeningRoom.project.id,
+                        screeningRoom.branchCode
                     );
                 }
             }

package/example/src/chevre/migrateRoomSectionAdditionalProperties.ts

@@ -0,0 +1,119 @@
+// tslint:disable:no-console
+// import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+// const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
+
+// tslint:disable-next-line:max-func-body-length
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const additionalPropertyRepo = await chevre.repository.AdditionalProperty.createInstance(mongoose.connection);
+    const placeRepo = await chevre.repository.place.MovieTheater.createInstance(mongoose.connection);
+
+    const cursor = placeRepo.getCursor(
+        {
+            typeOf: { $eq: chevre.factory.placeType.ScreeningRoom }
+            // 'project.id': { $eq: project.id },
+            // 'project.id': { $ne: EXCLUDED_PROJECT_ID },
+        },
+        {
+            // paymentMethods: 1,
+            // project: 1,
+            // orderDate: 1
+        }
+    );
+    console.log('places found');
+
+    const additionalPropertyNames: string[] = [];
+    const projectIds: string[] = [];
+    const unexpextedprojectIds: string[] = [];
+    let checked: number = 0;
+    let created: number = 0;
+
+    let i = 0;
+    await cursor.eachAsync(async (doc) => {
+        i += 1;
+        const screeningRoom: chevre.factory.place.screeningRoom.IPlace = doc.toObject();
+        const sections: Pick<chevre.factory.place.screeningRoomSection.IPlace, 'additionalProperty' | 'branchCode' | 'typeOf'>[] =
+            screeningRoom.containsPlace;
+        for (const section of sections) {
+            const additionalPropertyNamesOnResource = (Array.isArray(section.additionalProperty))
+                ? section.additionalProperty?.map((p) => p.name)
+                : [];
+            if (Array.isArray(additionalPropertyNamesOnResource) && additionalPropertyNamesOnResource.length > 0) {
+                console.log(
+                    additionalPropertyNamesOnResource.join(','),
+                    additionalPropertyNamesOnResource.length,
+                    'additionalPropertyNamesOnResource found',
+                    screeningRoom.project.id,
+                    section.branchCode
+                );
+                additionalPropertyNames.push(...additionalPropertyNamesOnResource);
+                projectIds.push(screeningRoom.project.id);
+                additionalPropertyNamesOnResource.forEach((name) => {
+                    if (!name.match(/^[a-zA-Z]*$/)) {
+                        // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                        unexpextedprojectIds.push(screeningRoom.project.id);
+                    }
+                    // tslint:disable-next-line:no-magic-numbers
+                    if (name.length < 5) {
+                        // throw new Error(`length matched ${creativeWork.project.id} ${creativeWork.id} ${name}`);
+                        unexpextedprojectIds.push(screeningRoom.project.id);
+                    }
+                });
+
+                for (const additionalPropertyNameOnResource of additionalPropertyNamesOnResource) {
+                    checked += 1;
+                    const existingAdditionalProperties = await additionalPropertyRepo.search({
+                        limit: 1,
+                        project: { id: { $eq: screeningRoom.project.id } },
+                        codeValue: { $eq: additionalPropertyNameOnResource },
+                        inCodeSet: { identifier: { $eq: section.typeOf } }
+                    });
+                    if (existingAdditionalProperties.length === 0) {
+                        const additionalProperty: chevre.factory.additionalProperty.IAdditionalProperty = {
+                            project: screeningRoom.project,
+                            // id?: string;
+                            typeOf: 'CategoryCode',
+                            codeValue: additionalPropertyNameOnResource,
+                            inCodeSet: {
+                                typeOf: 'CategoryCodeSet',
+                                identifier: section.typeOf
+                            },
+                            name: { ja: additionalPropertyNameOnResource }
+                        };
+                        await additionalPropertyRepo.save({ attributes: additionalProperty });
+                        created += 1;
+                        console.log(
+                            'additionalProerty created',
+                            additionalPropertyNameOnResource,
+                            screeningRoom.project.id,
+                            section.branchCode
+                        );
+                    } else {
+                        console.log(
+                            'additionalProerty existed',
+                            additionalPropertyNameOnResource,
+                            screeningRoom.project.id,
+                            section.branchCode
+                        );
+                    }
+                }
+            }
+        }
+    });
+    console.log(i, 'places checked');
+    console.log('additionalPropertyNames:', [...new Set(additionalPropertyNames)]);
+    console.log('projectIds:', [...new Set(projectIds)]);
+    console.log('unexpextedprojectIds:', [...new Set(unexpextedprojectIds)]);
+    console.log('checked:', checked);
+    console.log('created:', created);
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/playAroundTicket.ts

@@ -14,7 +14,7 @@ async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
     const ticketRepo = await chevre.repository.Ticket.createInstance(mongoose.connection);
-    const tickets = await ticketRepo.search(
+    const tickets = await ticketRepo.projectFields(
         {
             limit: 1,
             page: 1,
@@ -23,7 +23,8 @@ async function main() {
                 id: { $eq: project.id }
             },
             ticketToken: { $eq: TICKET_TOKEN }
-        }
+        },
+        []
     );
     console.log('tickets:', tickets);
     console.log(tickets.length, 'tickets found');

package/example/src/chevre/processAction.ts

@@ -23,6 +23,7 @@ async function main() {
             targetCollection: { typeOf: chevre.factory.offerType.Offer }
         }
     });
+    console.log('actions started,', action);
     // const error = new Error('sample error');
     // await actionRepo.giveUp({
     //     typeOf: action.typeOf,
@@ -30,11 +31,12 @@ async function main() {
     //     // error: { ...error, message: error.message, name: error.name }
     //     error
     // });
-    await actionRepo.completeWithVoid({
+    const result = await actionRepo.completeWithVoid({
         typeOf: action.typeOf,
         id: action.id,
         result: {}
     });
+    console.log('actions completed', result);
 }
 
 main()

package/example/src/chevre/projectFields.ts

@@ -0,0 +1,42 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const docs = await actionRepo.search(
+        {
+            limit: 1,
+            page: 1,
+            typeOf: { $eq: chevre.factory.actionType.AuthorizeAction }
+        },
+        ['id', 'typeOf', 'actionStatus'],
+        ['result', 'cancelAction', 'instrument', 'object']
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(docs, { depth: null });
+    console.log(docs.length, 'docs found');
+
+    const actions = await actionRepo.searchByOrderNumber(
+        {
+            orderNumber: 'CIN9-4893721-9248784'
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(actions, { depth: null });
+    console.log(actions.length, 'actions found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/{projectEventFieldsById.ts → projectFieldsById.ts}

@@ -11,23 +11,18 @@ console.log(`importing chevre took ${diff[0]} seconds and ${diff[1]} nanoseconds
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const eventRepo: chevre.repository.Event = await chevre.repository.Event.createInstance(mongoose.connection);
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
 
-    const event = await eventRepo.projectFieldsById(
+    const doc = await actionRepo.findById(
         {
-            // id: '120162210202407171202250'
-            id: 'blxonxv1m'
+            id: '66cc6030fe3d4df76011aa75',
+            typeOf: chevre.factory.actionType.DeleteAction
         },
-        // [
-        //     'project', 'organizer', 'typeOf',
-        //     'name', 'doorTime', 'endDate', 'eventStatus',
-        //     'location', 'startDate', 'superEvent',
-        //     'offers'
-        // ]
-        ['project', 'startDate', 'typeOf', 'superEvent.location.id']
+        ['id', 'actionStatus'],
+        []
     );
     // tslint:disable-next-line:no-null-keyword
-    console.dir(event, { depth: null });
+    console.dir(doc, { depth: null });
 }
 
 main()

package/example/src/chevre/searchActionsByPurpose.ts

@@ -0,0 +1,38 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+// const project = { id: String(process.env.PROJECT_ID) };
+
+mongoose.Model.on('index', (...args) => {
+    console.error('******** index event emitted. ********\n', args);
+});
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const actionRepo = await chevre.repository.Action.createInstance(mongoose.connection);
+
+    const docs = await actionRepo.searchByPurpose(
+        {
+            purpose: { id: '66ce6fe0f254c2172e578c9a', typeOf: chevre.factory.transactionType.PlaceOrder },
+            // typeOf: chevre.factory.actionType.AuthorizeAction,
+            object: {
+                // typeOf: { $eq: 'AggregateOffer' }
+                // paymentMethodId: { $eq: '137280454658483' }
+            },
+            actionStatus: { $eq: chevre.factory.actionStatusType.CompletedActionStatus },
+            sort: { startDate: chevre.factory.sortType.Descending }
+        }
+    );
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(docs, { depth: null });
+    // tslint:disable-next-line:no-null-keyword
+    console.dir(docs.map(({ typeOf, startDate }) => ({ typeOf, startDate })), { depth: null });
+    console.log(docs.length, 'docs found');
+}
+
+main()
+    .then()
+    .catch(console.error);

package/example/src/chevre/searchProjects.ts

@@ -3,29 +3,34 @@ 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 projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
 
     const project = await projectRepo.findById({
-        id: 'xxx',
+        id: PROJECT_ID,
         inclusion: [],
-        exclusion: ['settings']
+        exclusion: ['settings', 'hasMerchantReturnPolicy']
     });
     console.log('project:', project);
 
-    const projects = await projectRepo.search(
+    const projects = await projectRepo.projectFields(
         {
             limit: 1,
             page: 1,
             id: { $eq: project.id }
         },
-        ['_id', 'name'],
+        ['typeOf'],
         []
     );
     console.log(projects);
     console.log(projects.length, 'projects found');
+
+    const findAlternateNameByIdReulst = await projectRepo.findAlternateNameById({ id: project.id });
+    console.log('findAlternateNameByIdReulst:', findAlternateNameByIdReulst);
 }
 
 main()

package/example/src/chevre/searchSellersByAggregate.ts

@@ -15,7 +15,7 @@ async function main() {
             limit: 5,
             page: 1,
             sort: { branchCode: chevre.factory.sortType.Descending },
-            id: { $eq: 'xxx' }
+            id: { $eq: '59d20831e53ebc2b4e774466' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }
@@ -26,12 +26,12 @@ async function main() {
     console.log('sellers found', sellersByAggregate, sellersByAggregate[0]?.hasMerchantReturnPolicy);
     console.log(sellersByAggregate.length, 'sellers found');
 
-    const sellers = await sellerRepo.search(
+    const sellers = await sellerRepo.projectFields(
         {
             limit: 5,
             page: 1,
             sort: { branchCode: chevre.factory.sortType.Descending },
-            id: { $eq: 'xxx' }
+            id: { $eq: '59d20831e53ebc2b4e774466' }
             // project: { id: { $eq: project.id } }
             // paymentAccepted: { paymentMethodType: { $eq: 'Cash' } },
             // hasMerchantReturnPolicy: { applicablePaymentMethod: {} }

package/example/src/chevre/searchTransactions.ts

@@ -14,7 +14,7 @@ async function main() {
 
     const transactionRepo = await chevre.repository.Transaction.createInstance(mongoose.connection);
 
-    const transactions = await transactionRepo.search<chevre.factory.transactionType.PlaceOrder, 'status' | 'startDate'>({
+    const transactions = await transactionRepo.projectFields<chevre.factory.transactionType.PlaceOrder, 'status' | 'startDate'>({
         limit: 1,
         page: 1,
         project: { id: { $eq: project.id } },

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -6,49 +6,10 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const accountingReportRepo = await chevre.repository.AccountingReport.createInstance(mongoose.connection);
-    const aggregateReservationRepo = await chevre.repository.AggregateReservation.createInstance(mongoose.connection);
-    const reservationRepo = await chevre.repository.Reservation.createInstance(mongoose.connection);
-    const projectRepo = await chevre.repository.Project.createInstance(mongoose.connection);
+    const categoryCodeRepo = await chevre.repository.CategoryCode.createInstance(mongoose.connection);
 
     let updateResult: any;
-    updateResult = await accountingReportRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await aggregateReservationRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await projectRepo.unsetUnnecessaryFields({
-        filter: {
-            _id: { $exists: true }
-        },
-        $unset: {
-            createdAt: 1,
-            updatedAt: 1,
-            __v: 1
-        }
-    });
-    console.log(updateResult);
-
-    updateResult = await reservationRepo.unsetUnnecessaryFields({
+    updateResult = await categoryCodeRepo.unsetUnnecessaryFields({
         filter: {
             _id: { $exists: true }
         },

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

@@ -22,17 +22,23 @@
 /// <reference types="mongoose/types/validation" />
 /// <reference types="mongoose/types/virtuals" />
 /// <reference types="mongoose/types/inferschematype" />
-import type { Connection, Model } from 'mongoose';
+import type { Connection } from 'mongoose';
+import * as factory from '../factory';
+import { IModel } from './mongoose/schemas/accountTitle';
 /**
  * 科目リポジトリ
  */
 export declare class AccountTitleRepo {
-    readonly accountTitleModel: typeof Model;
+    readonly accountTitleModel: IModel;
     constructor(connection: Connection);
     deleteByProject(params: {
         project: {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<any, import("mongoose").QueryOptions<any>>;
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle> & Omit<factory.accountTitle.IAccountTitle & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>, import("mongoose").QueryOptions<import("mongoose").Document<unknown, {}, factory.accountTitle.IAccountTitle> & Omit<factory.accountTitle.IAccountTitle & {
+        _id: import("mongoose").Types.ObjectId;
+    }, never>>>;
 }

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

@@ -1,20 +1,8 @@
 import type { Connection, PipelineStage } from 'mongoose';
+import { IAccountingReport, IChildReport, IOrder4report } from './mongoose/schemas/accountingReport';
 import * as factory from '../factory';
 type IMatchStage = PipelineStage.Match;
-export type IOrder4report = factory.report.accountingReport.IOrderAsMainEntity;
-export interface IChildReport {
-    typeOf: 'Report';
-    mainEntity: factory.report.accountingReport.IAction;
-}
-export interface IAccountingReport {
-    project: {
-        id: string;
-        typeOf: factory.organizationType.Project;
-    };
-    typeOf: 'Report';
-    hasPart: IChildReport[];
-    mainEntity: IOrder4report;
-}
+export { IAccountingReport, IChildReport, IOrder4report };
 /**
  * 経理レポートリポジトリ
  */
@@ -58,4 +46,3 @@ export declare class AccountingReportRepo {
         $unset: any;
     }): Promise<import("mongodb").UpdateResult>;
 }
-export {};