@chevre/domain 22.11.0-alpha.0 → 22.11.0-alpha.10

package/example/src/chevre/unsetUnnecessaryFields.ts

@@ -9,17 +9,20 @@ import { chevre } from '../../../lib/index';
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
 
-    const aggregateOfferRepo = await chevre.repository.AggregateOffer.createInstance(mongoose.connection);
+    const settingRepo = await chevre.repository.Setting.createInstance(mongoose.connection);
 
     let updateResult: any;
 
-    updateResult = await aggregateOfferRepo.unsetUnnecessaryFields({
+    updateResult = await settingRepo.unsetUnnecessaryFields({
         filter: {
-            'offers.includedInDataCatalog.id': { $exists: true }
-            // _id: { $eq: 'blj55y1mo' }
+            'project.id': { $eq: '*' }
         },
         $unset: {
-            'offers.0.includedInDataCatalog': 1
+            useMongoAsStockHolder: 1,
+            useMongoAsStockHolderProjects: 1
+            // useMongo4confirmationNumberFrom: 1,
+            // useMongo4orderNumberFrom: 1,
+            // useMongo4transactionNumberFrom: 1
         }
     });
     console.log(updateResult);

package/lib/chevre/index.d.ts

@@ -3,7 +3,6 @@
  */
 import type * as COAService from '@motionpicture/coa-service';
 import type * as GMOService from '@motionpicture/gmo-service';
-import type * as AdminAuth from './adminAuth';
 import type * as Pecorinoapi from './pecorinoapi';
 import { credentials } from './credentials';
 import * as errorHandler from './errorHandler';
@@ -13,7 +12,6 @@ import * as repository from './repository';
 import * as service from './service';
 import * as settings from './settings';
 export { credentials, errorHandler, eventEmitter, factory, repository, service, settings };
-export declare function loadAdminAuth(): Promise<typeof AdminAuth>;
 export declare function loadPecorinoapi(): Promise<typeof Pecorinoapi>;
 export type COA = typeof COAService;
 export declare function loadCOA(): Promise<typeof COAService>;

package/lib/chevre/index.js

@@ -10,7 +10,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.settings = exports.service = exports.repository = exports.factory = exports.eventEmitter = exports.errorHandler = exports.credentials = void 0;
-exports.loadAdminAuth = loadAdminAuth;
 exports.loadPecorinoapi = loadPecorinoapi;
 exports.loadCOA = loadCOA;
 exports.loadGMO = loadGMO;
@@ -28,15 +27,6 @@ const service = require("./service");
 exports.service = service;
 const settings = require("./settings");
 exports.settings = settings;
-let adminAuth;
-function loadAdminAuth() {
-    return __awaiter(this, void 0, void 0, function* () {
-        if (adminAuth === undefined) {
-            adminAuth = yield Promise.resolve().then(() => require('./adminAuth'));
-        }
-        return adminAuth;
-    });
-}
 let pecorinoapi;
 function loadPecorinoapi() {
     return __awaiter(this, void 0, void 0, function* () {

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

@@ -20,7 +20,9 @@ export declare class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection?: IProjection4searchWithUnwoundAcceptedOffers): Promise<factory.order.IOrder[]>;
+    searchWithUnwoundAcceptedOffers(params: factory.order.ISearchConditions, projection: IProjection4searchWithUnwoundAcceptedOffers, options: {
+        useLimitAfterSkip: boolean;
+    }): Promise<factory.order.IOrder[]>;
     aggreateOwnershipInfosByOrder(filter: {
         orderNumber: {
             $eq: string;

package/lib/chevre/repo/acceptedOffer.js

@@ -24,9 +24,10 @@ class AcceptedOfferRepo {
     /**
      * オファー展開の注文検索
      */
-    searchWithUnwoundAcceptedOffers(params, projection) {
+    searchWithUnwoundAcceptedOffers(params, projection, options) {
         return __awaiter(this, void 0, void 0, function* () {
             var _a;
+            const { useLimitAfterSkip } = options;
             const conditions = order_2.OrderRepo.CREATE_MONGO_CONDITIONS(params);
             const aggregate = this.orderModel.aggregate();
             // pipelineの順序に注意
@@ -43,8 +44,15 @@ class AcceptedOfferRepo {
             aggregate.project(Object.assign(Object.assign({}, projection), { acceptedOffers: ['$acceptedOffers'] }));
             if (typeof params.limit === 'number' && params.limit > 0) {
                 const page = (typeof params.page === 'number' && params.page > 0) ? params.page : 1;
-                aggregate.limit(params.limit * page)
-                    .skip(params.limit * (page - 1));
+                // support skip -> limit(2025-07-09~)
+                if (useLimitAfterSkip) {
+                    aggregate.skip(params.limit * (page - 1))
+                        .limit(params.limit);
+                }
+                else {
+                    aggregate.limit(params.limit * page)
+                        .skip(params.limit * (page - 1));
+                }
             }
             return aggregate
                 // .allowDiskUse(true) // false化(2023-11-30~)

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

@@ -1,14 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 /**
  * 確認番号リポジトリ
  */
 export declare class ConfirmationNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     private static alignDigits;
@@ -20,11 +16,4 @@ export declare class ConfirmationNumberRepo {
     publish(params: {
         orderDate: Date;
     }): Promise<string>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4confirmationNumberFrom(params: {
-        useMongo4confirmationNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4confirmationNumberFrom"> | null>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/confirmationNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ConfirmationNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const CONFIRMATION_NUMBER_MIN_LENGH = 4;
@@ -24,8 +25,8 @@ const TIMEZONE = 'Asia/Tokyo';
  */
 class ConfirmationNumberRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     static alignDigits(params) {
@@ -72,59 +73,19 @@ class ConfirmationNumberRepo {
             const dataFeedIdentifier = ConfirmationNumberRepo.createDataFeedIdentifier({ orderDate: params.orderDate });
             let incrReply;
             // support publishByMongo(2025-05-23~)
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                // データ保管期間はとりあえず2 months
-                dataFeedExpires = moment(params.orderDate)
-                    // tslint:disable-next-line:no-magic-numbers
-                    .add(2, 'months')
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                // データ保管期間はとりあえず一か月
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'month')
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            // データ保管期間はとりあえず2 months
+            dataFeedExpires = moment(params.orderDate)
+                // tslint:disable-next-line:no-magic-numbers
+                .add(2, 'months')
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.confirmationNumber },
+                expires: dataFeedExpires
+            });
             return ConfirmationNumberRepo.count2confirmationNumber({ count: incrReply });
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4confirmationNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4confirmationNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4confirmationNumberFrom }
-            }, { projection: { _id: 0, useMongo4confirmationNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4confirmationNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4confirmationNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4confirmationNumberFrom;
-            return useMongo4confirmationNumberFrom instanceof Date
-                && moment(params.orderDate)
-                    .isSameOrAfter(moment(useMongo4confirmationNumberFrom));
-        });
-    }
 }
 exports.ConfirmationNumberRepo = ConfirmationNumberRepo;

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

@@ -1,6 +1,8 @@
 import { Connection, FilterQuery, QueryOptions } from 'mongoose';
 import * as factory from '../factory';
-export type ISavingIdentity = Pick<factory.creativeWork.certification.webApplication.ICertification, 'about' | 'project' | 'typeOf'> & {
+type ISavingSoftwareApplicationIdentity = Pick<factory.creativeWork.certification.softwareApplication.ICertification, 'about' | 'project' | 'typeOf'>;
+type ISavingWebApplicationIdentity = Pick<factory.creativeWork.certification.webApplication.ICertification, 'about' | 'project' | 'typeOf'>;
+export type ISavingIdentity = (ISavingSoftwareApplicationIdentity | ISavingWebApplicationIdentity) & {
     id?: never;
     dateCreated?: never;
     dateModified?: never;
@@ -11,7 +13,7 @@ interface IUnset {
         [key: string]: 1;
     };
 }
-type IIdentityWithId = factory.creativeWork.certification.webApplication.ICertification & {
+type IIdentityWithId = (factory.creativeWork.certification.softwareApplication.ICertification | factory.creativeWork.certification.webApplication.ICertification) & {
     id: string;
 };
 type IKeyOfProjection = keyof factory.creativeWork.certification.webApplication.ICertification;
@@ -35,39 +37,15 @@ export declare class IdentityRepo {
             id: string;
         };
     }): Promise<void>;
-    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    } & {
+    getCursor(conditions: any, projection: any): import("mongoose").Cursor<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> | Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id">> & ((Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> & {
         _id: import("mongoose").Types.ObjectId;
-    }, QueryOptions<import("mongoose").Document<unknown, {}, {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    }> & {
-        project: Pick<factory.project.IProject, "id" | "typeOf">;
-        typeOf: factory.creativeWorkType.Certification;
-        about: import("@chevre/factory/lib/creativeWork/certification/webApplication").IAbout;
-        dateCreated?: Date | undefined;
-        dateModified?: Date | undefined;
-        issuedBy: import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy | import("@chevre/factory/lib/creativeWork/certification/webApplication").IIssuedBy[];
-    } & {
+    }) | (Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id"> & {
         _id: import("mongoose").Types.ObjectId;
-    }>>;
+    })), QueryOptions<import("mongoose").Document<unknown, {}, Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> | Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id">> & ((Omit<import("@chevre/factory/lib/creativeWork/certification/softwareApplication").ICertification, "id"> & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | (Omit<import("@chevre/factory/lib/creativeWork/certification/webApplication").ICertification, "id"> & {
+        _id: import("mongoose").Types.ObjectId;
+    }))>>;
     updateIssuedBy2array(params: Pick<ISavingIdentity, 'issuedBy'> & {
         id: string;
     }): Promise<void>;

package/lib/chevre/repo/identity.js

@@ -8,17 +8,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.IdentityRepo = void 0;
 const factory = require("../factory");
@@ -76,12 +65,15 @@ class IdentityRepo {
                     throw new factory.errors.ArgumentNull('id');
                 }
                 // issuedByのみ更新可能
-                const _c = params.attributes, { id, dateCreated, about, project, typeOf, $unset } = _c, updateFields = __rest(_c, ["id", "dateCreated", "about", "project", "typeOf", "$unset"]);
+                const { project, $unset, issuedBy } = params.attributes;
                 const filter = {
                     _id: { $eq: savingId },
                     'project.id': { $eq: project.id }
                 };
-                const update = Object.assign({ $set: Object.assign(Object.assign({}, updateFields), { dateModified: new Date() }) }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
+                const update = Object.assign({ $set: {
+                        issuedBy,
+                        dateModified: new Date()
+                    } }, ($unset !== undefined && $unset !== null) ? { $unset } : undefined);
                 const options = {
                     upsert: false,
                     new: true,
@@ -96,8 +88,11 @@ class IdentityRepo {
                 savedId = savingId;
             }
             else {
-                const _d = params.attributes, { $unset, id, dateModified } = _d, createParams = __rest(_d, ["$unset", "id", "dateModified"]);
-                const result = yield this.identityModel.insertMany(Object.assign(Object.assign({}, createParams), { dateCreated: new Date() }), { rawResult: true });
+                const { typeOf, about, project, issuedBy } = params.attributes;
+                const result = yield this.identityModel.insertMany({
+                    typeOf, about, project, issuedBy,
+                    dateCreated: new Date()
+                }, { rawResult: true });
                 const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
                 if (typeof insertedId !== 'string') {
                     throw new factory.errors.Internal(`seller not saved unexpectedly. result:${JSON.stringify(result)}`);

package/lib/chevre/repo/mongoose/schemas/identity.d.ts

@@ -1,6 +1,6 @@
 import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
 import * as factory from '../../../factory';
-type IDocType = Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
+type IDocType = Omit<factory.creativeWork.certification.softwareApplication.ICertification, 'id'> | Omit<factory.creativeWork.certification.webApplication.ICertification, 'id'>;
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

package/lib/chevre/repo/mongoose/schemas/member.d.ts

@@ -5,6 +5,6 @@ type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
 declare const modelName = "Member";
-declare function createSchema(): ISchema;
 declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
 export { createSchema, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/member.js

@@ -4,6 +4,7 @@ exports.modelName = exports.indexes = void 0;
 exports.createSchema = createSchema;
 const mongoose_1 = require("mongoose");
 const writeConcern_1 = require("../writeConcern");
+const factory = require("../../../factory");
 const settings_1 = require("../../../settings");
 const modelName = 'Member';
 exports.modelName = modelName;
@@ -45,21 +46,21 @@ const schemaOptions = {
         versionKey: false
     }
 };
-/**
- * IAMメンバースキーマ
- */
-let schema;
-function createSchema() {
-    if (schema === undefined) {
-        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
-    }
-    return schema;
-}
 const indexes = [
     [
         { 'member.id': 1 },
         { name: 'searchByMemberId' }
     ],
+    [
+        { 'project.id': 1, 'member.id': 1 },
+        {
+            name: 'uniqueByMemberId', // プロジェクトメンバーは販売者メンバーになれない
+            unique: true,
+            partialFilterExpression: {
+                'member.memberOf.typeOf': { $eq: factory.organizationType.Project }
+            }
+        }
+    ],
     [
         { 'project.id': 1, 'member.id': 1, 'member.memberOf.id': 1 },
         {
@@ -95,3 +96,18 @@ const indexes = [
     ]
 ];
 exports.indexes = indexes;
+/**
+ * IAMメンバースキーマ
+ */
+let schema;
+function createSchema() {
+    if (schema === undefined) {
+        schema = new mongoose_1.Schema(schemaDefinition, schemaOptions);
+        if (settings_1.MONGO_AUTO_INDEX) {
+            indexes.forEach((indexParams) => {
+                schema === null || schema === void 0 ? void 0 : schema.index(...indexParams);
+            });
+        }
+    }
+    return schema;
+}

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

@@ -1,14 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
-import { ISetting } from './mongoose/schemas/setting';
 /**
  * 注文番号リポジトリ
  */
 export declare class OrderNumberRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -23,11 +19,4 @@ export declare class OrderNumberRepo {
          */
         orderDate: Date;
     }): Promise<string>;
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params: {
-        useMongo4orderNumberFrom: Date;
-    }): Promise<Pick<ISetting, "useMongo4orderNumberFrom"> | null>;
-    private useMongoBySettings;
 }

package/lib/chevre/repo/orderNumber.js

@@ -12,9 +12,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.OrderNumberRepo = void 0;
 const cdigit = require("cdigit");
 const moment = require("moment-timezone");
+// import { RedisClientType } from 'redis';
 // tslint:disable-next-line:no-require-imports no-var-requires
 const fpe = require('node-fpe');
-const setting_1 = require("./mongoose/schemas/setting");
+// import { createSchema as createSettingSchema, modelName as settingModelName } from './mongoose/schemas/setting';
 const transactionNumber_1 = require("./mongoose/schemas/transactionNumber");
 const transactionNumberCounter_1 = require("./transactionNumberCounter");
 const ORDER_NUMBER_SEPARATOR = '-';
@@ -23,8 +24,8 @@ const ORDER_NUMBER_SEPARATOR = '-';
  */
 class OrderNumberRepo {
     constructor(params) {
-        const { connection } = params;
-        this.settingModel = connection.model(setting_1.modelName, (0, setting_1.createSchema)());
+        // const { connection } = params;
+        // this.settingModel = connection.model(settingModelName, createSettingSchema());
         this.counterRepo = new transactionNumberCounter_1.TransactionNumberCounterRepo(params);
     }
     // private static createKey(params: {
@@ -52,27 +53,15 @@ class OrderNumberRepo {
             let dataFeedExpires;
             const dataFeedIdentifier = `${projectPrefix}:${timestamp}`;
             let incrReply;
-            const useMongoBySettings = yield this.useMongoBySettings(params);
-            if (useMongoBySettings) {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByMongo({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
-            else {
-                dataFeedExpires = moment(params.orderDate)
-                    .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
-                    .toDate();
-                incrReply = yield this.counterRepo.incrementByRedis({
-                    identifier: dataFeedIdentifier,
-                    includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
-                    expires: dataFeedExpires
-                });
-            }
+            // const useMongoBySettings = await this.useMongoBySettings(params);
+            dataFeedExpires = moment(params.orderDate)
+                .add(1, 'minute') // ミリ秒でカウントしていくので、注文日時後1分で十分
+                .toDate();
+            incrReply = yield this.counterRepo.incrementByMongo({
+                identifier: dataFeedIdentifier,
+                includedInDataCatalog: { identifier: transactionNumber_1.DataCatalogIdentifier.orderNumber },
+                expires: dataFeedExpires
+            });
             let orderNumber = `${timestamp}${incrReply}`;
             // checkdigit
             const cd = cdigit.luhn.compute(orderNumber);
@@ -90,32 +79,5 @@ class OrderNumberRepo {
             return orderNumber;
         });
     }
-    /**
-     * DB移行時のみに使用目的の設定更新
-     */
-    setUseMongo4orderNumberFrom(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const { useMongo4orderNumberFrom } = params;
-            return this.settingModel.findOneAndUpdate({ 'project.id': { $eq: '*' } }, {
-                $set: { useMongo4orderNumberFrom }
-            }, { projection: { _id: 0, useMongo4orderNumberFrom: 1 } })
-                .lean()
-                .exec();
-        });
-    }
-    useMongoBySettings(params) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const setting = yield this.settingModel.findOne({ 'project.id': { $eq: '*' } }, {
-                _id: 0,
-                useMongo4orderNumberFrom: 1
-            })
-                .lean()
-                .exec();
-            const useMongo4orderNumberFrom = setting === null || setting === void 0 ? void 0 : setting.useMongo4orderNumberFrom;
-            return useMongo4orderNumberFrom instanceof Date
-                && moment(params.orderDate)
-                    .isSameOrAfter(moment(useMongo4orderNumberFrom));
-        });
-    }
 }
 exports.OrderNumberRepo = OrderNumberRepo;

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

@@ -26,8 +26,19 @@ export declare class RoleRepo {
     }): Promise<(import("mongoose").FlattenMaps<IDocType> & {
         _id: import("mongoose").Types.ObjectId;
     }) | null>;
+    removePermissionIfExists(params: {
+        roleName: {
+            $eq: factory.role.organizationRole.RoleName;
+        };
+        permission: string;
+    }): Promise<(import("mongoose").FlattenMaps<IDocType> & {
+        _id: import("mongoose").Types.ObjectId;
+    }) | null>;
     addMember(params: Pick<IRole, 'member' | 'memberOf' | 'roleName'>): Promise<(import("mongoose").FlattenMaps<IDocType> & {
         _id: import("mongoose").Types.ObjectId;
     }) | null>;
+    create(params: Pick<IRole, 'member' | 'memberOf' | 'permissions' | 'roleName'>): Promise<{
+        id: string;
+    }>;
 }
 export {};

package/lib/chevre/repo/role.js

@@ -10,6 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RoleRepo = void 0;
+const factory = require("../factory");
 const settings_1 = require("../settings");
 const role_1 = require("./mongoose/schemas/role");
 const AVAILABLE_PROJECT_FIELDS = [
@@ -132,6 +133,23 @@ class RoleRepo {
                 .exec();
         });
     }
+    removePermissionIfExists(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.roleModel.findOneAndUpdate({
+                roleName: { $eq: params.roleName.$eq },
+                permissions: { $eq: params.permission }
+            }, {
+                $pull: {
+                    permissions: params.permission
+                }
+            }, {
+                new: true,
+                projection: { _id: 1 }
+            })
+                .lean()
+                .exec();
+        });
+    }
     addMember(params) {
         return __awaiter(this, void 0, void 0, function* () {
             const { roleName, member, memberOf } = params;
@@ -148,5 +166,23 @@ class RoleRepo {
                 .exec();
         });
     }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            let savedId;
+            const { member, memberOf, permissions, roleName } = params;
+            const creatingRole = {
+                member, memberOf, permissions, roleName,
+                typeOf: factory.role.RoleType.OrganizationRole
+            };
+            const result = yield this.roleModel.insertMany(creatingRole, { rawResult: true });
+            const insertedId = (_b = (_a = result.insertedIds) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.toHexString();
+            if (typeof insertedId !== 'string') {
+                throw new factory.errors.Internal(`role not saved unexpectedly. result:${JSON.stringify(result)}`);
+            }
+            savedId = insertedId;
+            return { id: savedId };
+        });
+    }
 }
 exports.RoleRepo = RoleRepo;

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

@@ -1,13 +1,10 @@
 import type { Connection } from 'mongoose';
-import { RedisClientType } from 'redis';
 /**
  * サービスアウトプット識別子リポジトリ
  */
 export declare class ServiceOutputIdentifierRepo {
-    private readonly settingModel;
     private readonly counterRepo;
     constructor(params: {
-        redisClient: RedisClientType;
         connection: Connection;
     });
     /**
@@ -16,5 +13,4 @@ export declare class ServiceOutputIdentifierRepo {
     publishByTimestamp(params: {
         startDate: Date;
     }): Promise<string>;
-    private useMongoBySettings;
 }