@chevre/domain 22.8.0-alpha.12 → 22.8.0-alpha.14

package/example/src/chevre/adminMemberProgram.ts

@@ -0,0 +1,59 @@
+// tslint:disable:no-console
+import * as mongoose from 'mongoose';
+
+import { chevre } from '../../../lib/index';
+
+const project = { id: String(process.env.PROJECT_ID) };
+const ISSUER_ID = '6787461fc8571271cec198b2';
+const PROGRAM_IDENTIFIER = 'Default';
+
+async function main() {
+    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
+
+    const memberProgramRepo = await chevre.repository.MemberProgram.createInstance(mongoose.connection);
+
+    let programs = await memberProgramRepo.search({
+        project: { id: { $eq: project.id } },
+        hostingOrganization: { id: { $eq: ISSUER_ID } }
+    });
+    console.log('programs:', programs);
+    console.log(programs.length, 'programs found');
+
+    try {
+        await memberProgramRepo.deleteOne({
+            project: { id: project.id },
+            identifier: PROGRAM_IDENTIFIER,
+            hostingOrganization: { id: ISSUER_ID }
+        });
+        console.log('program deleted');
+    } catch (error) {
+        console.error(error);
+    }
+
+    programs = await memberProgramRepo.search({
+        project: { id: { $eq: project.id } },
+        hostingOrganization: { id: { $eq: ISSUER_ID } },
+        identifier: { $eq: PROGRAM_IDENTIFIER }
+    });
+    console.log('programs:', programs);
+    console.log(programs.length, 'programs found');
+
+    await memberProgramRepo.create({
+        project: { id: project.id },
+        identifier: PROGRAM_IDENTIFIER,
+        hostingOrganization: { id: ISSUER_ID }
+    });
+    console.log('program created');
+
+    programs = await memberProgramRepo.search({
+        project: { id: { $eq: project.id } },
+        hostingOrganization: { id: { $eq: ISSUER_ID } },
+        identifier: { $eq: PROGRAM_IDENTIFIER }
+    });
+    console.log('programs:', programs);
+    console.log(programs.length, 'programs found');
+}
+
+main()
+    .then()
+    .catch(console.error);

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

@@ -11,4 +11,16 @@ export declare class IssuerRepo {
         id: string;
     }>;
     projectPublicFields(params: ISearchConditions): Promise<Pick<IIssuer, 'id' | 'identifier' | 'project'>[]>;
+    findById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<IIssuer>;
+    deleteById(params: {
+        id: string;
+        project: {
+            id: string;
+        };
+    }): Promise<void>;
 }

package/lib/chevre/repo/issuer.js

@@ -59,7 +59,7 @@ class IssuerRepo {
             }
             else {
                 const { id, identifier, project } = params, updateFields = __rest(params, ["id", "identifier", "project"]);
-                doc = yield this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, updateFields, { upsert: false, new: true, projection: { _id: 1 } })
+                doc = yield this.issuerModel.findOneAndUpdate({ _id: { $eq: params.id } }, { $set: updateFields }, { upsert: false, new: true, projection: { _id: 1 } })
                     .exec();
                 savedId = params.id;
             }
@@ -93,5 +93,36 @@ class IssuerRepo {
                 .exec();
         });
     }
+    findById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const projection = {
+                _id: 0,
+                id: { $toString: '$_id' },
+                identifier: 1,
+                project: 1,
+                tokenSecret: 1
+            };
+            const query = this.issuerModel.findOne({
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
+            }, projection);
+            const issuer = yield query.setOptions({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .lean()
+                .exec();
+            if (issuer === null) {
+                throw new factory.errors.NotFound('Issuer');
+            }
+            return issuer;
+        });
+    }
+    deleteById(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.issuerModel.findOneAndDelete({
+                _id: { $eq: params.id },
+                'project.id': { $eq: params.project.id }
+            }, { projection: { _id: 1 } })
+                .exec();
+        });
+    }
 }
 exports.IssuerRepo = IssuerRepo;

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

@@ -0,0 +1,53 @@
+import { Connection } from 'mongoose';
+import { IMemberProgram } from './mongoose/schemas/issuer';
+/**
+ * メンバープログラムリポジトリ
+ */
+export declare class MemberProgramRepo {
+    private readonly issuerModel;
+    constructor(connection: Connection);
+    search(params: {
+        limit?: number;
+        page?: number;
+        project?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        hostingOrganization?: {
+            id?: {
+                $eq?: string;
+            };
+        };
+        identifier?: {
+            $eq?: string;
+        };
+    }): Promise<IMemberProgram[]>;
+    create(params: {
+        project: {
+            id: string;
+        };
+        identifier: string;
+        hostingOrganization: {
+            id: string;
+        };
+    }): Promise<void>;
+    updateOne(params: {
+        project: {
+            id: string;
+        };
+        identifier: string;
+        hostingOrganization: {
+            id: string;
+        };
+    }): Promise<void>;
+    deleteOne(params: {
+        project: {
+            id: string;
+        };
+        identifier: string;
+        hostingOrganization: {
+            id: string;
+        };
+    }): Promise<void>;
+}

package/lib/chevre/repo/memberProgram.js

@@ -0,0 +1,140 @@
+"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.MemberProgramRepo = void 0;
+const mongoose_1 = require("mongoose");
+const factory = require("../factory");
+const settings_1 = require("../settings");
+const issuer_1 = require("./mongoose/schemas/issuer");
+/**
+ * メンバープログラムリポジトリ
+ */
+class MemberProgramRepo {
+    constructor(connection) {
+        this.issuerModel = connection.model(issuer_1.modelName, (0, issuer_1.createSchema)());
+    }
+    search(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d, _e;
+            const matchStages = [];
+            const projectIdEq = (_b = (_a = params.project) === null || _a === void 0 ? void 0 : _a.id) === null || _b === void 0 ? void 0 : _b.$eq;
+            if (typeof projectIdEq === 'string') {
+                matchStages.push({ $match: { 'project.id': { $eq: projectIdEq } } });
+            }
+            const hostingOrganizationIdEq = (_d = (_c = params.hostingOrganization) === null || _c === void 0 ? void 0 : _c.id) === null || _d === void 0 ? void 0 : _d.$eq;
+            if (typeof hostingOrganizationIdEq === 'string') {
+                matchStages.push({ $match: { _id: { $eq: new mongoose_1.Types.ObjectId(hostingOrganizationIdEq) } } });
+            }
+            const identifierEq = (_e = params.identifier) === null || _e === void 0 ? void 0 : _e.$eq;
+            if (typeof identifierEq === 'string') {
+                matchStages.push({ $match: { 'hasMemberProgram.identifier': { $exists: true, $eq: identifierEq } } });
+            }
+            const aggregate = this.issuerModel.aggregate([
+                {
+                    $unwind: {
+                        path: '$hasMemberProgram'
+                    }
+                },
+                ...matchStages,
+                // { $sort: { 'makesOffer.availableAtOrFrom.id': factory.sortType.Ascending } },
+                {
+                    $project: {
+                        _id: 0,
+                        typeOf: '$hasMemberProgram.typeOf',
+                        identifier: '$hasMemberProgram.identifier',
+                        hostingOrganization: {
+                            identifier: '$identifier'
+                        }
+                    }
+                }
+            ]);
+            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));
+            }
+            return aggregate.option({ maxTimeMS: settings_1.MONGO_MAX_TIME_MS })
+                .exec();
+        });
+    }
+    create(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let doc = yield this.issuerModel.findOne({
+                _id: { $eq: params.hostingOrganization.id },
+                'project.id': { $eq: params.project.id }
+            }, { _id: 1 })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('Issuer');
+            }
+            const creatingMemberProgram = {
+                typeOf: 'MemberProgram',
+                identifier: params.identifier
+            };
+            doc = yield this.issuerModel.findOneAndUpdate({
+                _id: { $eq: params.hostingOrganization.id },
+                'project.id': { $eq: params.project.id },
+                'hasMemberProgram.identifier': { $ne: params.identifier }
+            }, {
+                $push: { hasMemberProgram: creatingMemberProgram }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.AlreadyInUse('hasMemberProgram', ['identifier']);
+            }
+        });
+    }
+    updateOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const updatingMakesOffer = {
+                typeOf: 'MemberProgram',
+                identifier: params.identifier
+            };
+            const doc = yield this.issuerModel.findOneAndUpdate({
+                _id: { $eq: params.hostingOrganization.id },
+                'project.id': { $eq: params.project.id },
+                'hasMemberProgram.identifier': { $exists: true, $eq: params.identifier }
+            }, {
+                $set: { 'hasMemberProgram.$[hasMemberProgramElement]': updatingMakesOffer }
+            }, {
+                new: true,
+                arrayFilters: [
+                    { 'hasMemberProgramElement.identifier': { $eq: params.identifier } }
+                ],
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('MemberProgram');
+            }
+        });
+    }
+    deleteOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const doc = yield this.issuerModel.findOneAndUpdate({
+                _id: { $eq: params.hostingOrganization.id },
+                'project.id': { $eq: params.project.id },
+                'hasMemberProgram.identifier': { $exists: true, $eq: params.identifier }
+            }, {
+                $pull: { hasMemberProgram: { identifier: params.identifier } }
+            }, {
+                projection: { _id: 1 }
+            })
+                .exec();
+            if (doc === null) {
+                throw new factory.errors.NotFound('MemberProgram');
+            }
+        });
+    }
+}
+exports.MemberProgramRepo = MemberProgramRepo;

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

@@ -22,8 +22,15 @@ export interface IIssuer {
     id: string;
     identifier: string;
     project: Pick<factory.project.IProject, 'id' | 'typeOf'>;
+    tokenSecret?: string;
 }
-export type IDocType = IIssuer;
+export interface IMemberProgram {
+    typeOf: 'MemberProgram';
+    identifier: string;
+}
+export type IDocType = IIssuer & {
+    hasMemberProgram?: IMemberProgram[];
+};
 type IModel = Model<IDocType>;
 type ISchemaDefinition = SchemaDefinition<IDocType>;
 type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;

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

@@ -9,7 +9,9 @@ const modelName = 'Issuer';
 exports.modelName = modelName;
 const schemaDefinition = {
     project: { type: mongoose_1.SchemaTypes.Mixed, required: true },
-    identifier: { type: String, required: true }
+    identifier: { type: String, required: true },
+    tokenSecret: String,
+    hasMemberProgram: [mongoose_1.SchemaTypes.Mixed]
 };
 const schemaOptions = {
     autoIndex: settings_1.MONGO_AUTO_INDEX,

package/lib/chevre/repository.d.ts

@@ -26,6 +26,7 @@ import type { EventSeriesRepo } from './repo/eventSeries';
 import type { InterfaceRepo } from './repo/interface';
 import type { IssuerRepo } from './repo/issuer';
 import type { MemberRepo } from './repo/member';
+import type { MemberProgramRepo } from './repo/memberProgram';
 import type { MerchantReturnPolicyRepo } from './repo/merchantReturnPolicy';
 import type { MessageRepo } from './repo/message';
 import type { NoteRepo } from './repo/note';
@@ -178,6 +179,10 @@ export type Member = MemberRepo;
 export declare namespace Member {
     function createInstance(...params: ConstructorParameters<typeof MemberRepo>): Promise<MemberRepo>;
 }
+export type MemberProgram = MemberProgramRepo;
+export declare namespace MemberProgram {
+    function createInstance(...params: ConstructorParameters<typeof MemberProgramRepo>): Promise<MemberProgramRepo>;
+}
 export type MerchantReturnPolicy = MerchantReturnPolicyRepo;
 export declare namespace MerchantReturnPolicy {
     function createInstance(...params: ConstructorParameters<typeof MerchantReturnPolicyRepo>): Promise<MerchantReturnPolicyRepo>;

package/lib/chevre/repository.js

@@ -9,8 +9,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.Member = exports.Issuer = exports.Interface = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.Reservation = void 0;
+exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.place = exports.Permit = exports.Person = exports.paymentMethod = exports.PaymentServiceProvider = exports.PaymentService = exports.Passport = exports.OwnershipInfo = exports.OrderNumber = exports.OrderInTransaction = exports.Order = exports.Offer = exports.OfferItemCondition = exports.OfferCatalogItem = exports.OfferCatalog = exports.Note = exports.Message = exports.MerchantReturnPolicy = exports.MemberProgram = exports.Member = exports.Issuer = exports.Interface = exports.EventSeries = exports.EventSellerMakesOffer = exports.Event = exports.EmailMessage = exports.CustomerType = exports.Customer = exports.Credentials = exports.CreativeWork = exports.ConfirmationNumber = exports.Comment = exports.Authorization = exports.CategoryCode = exports.AssetTransaction = exports.Aggregation = exports.AggregateReservation = exports.AggregateOffer = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
+exports.rateLimit = exports.Trip = exports.TransactionProcess = exports.TransactionNumber = exports.Transaction = exports.Ticket = exports.Telemetry = exports.Task = exports.StockHolder = exports.setting = exports.Setting = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.Reservation = exports.ProjectMakesOffer = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -349,6 +349,19 @@ var Member;
     }
     Member.createInstance = createInstance;
 })(Member || (exports.Member = Member = {}));
+var MemberProgram;
+(function (MemberProgram) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/memberProgram'))).MemberProgramRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    MemberProgram.createInstance = createInstance;
+})(MemberProgram || (exports.MemberProgram = MemberProgram = {}));
 var MerchantReturnPolicy;
 (function (MerchantReturnPolicy) {
     let repo;

package/package.json

@@ -112,5 +112,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "22.8.0-alpha.12"
+  "version": "22.8.0-alpha.14"
 }

package/example/src/chevre/adminSellerPaymentAccepted.ts

@@ -1,60 +0,0 @@
-// tslint:disable:no-console
-import * as mongoose from 'mongoose';
-
-import { chevre } from '../../../lib/index';
-
-const project = { id: String(process.env.PROJECT_ID) };
-const SELLER_ID = '59d20831e53ebc2b4e774466';
-const PAYMENT_METHOD_TYPE = 'Cash';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI, { autoIndex: false });
-
-    const paymentAcceptedRepo = await chevre.repository.SellerPaymentAccepted.createInstance(mongoose.connection);
-
-    let paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-
-    try {
-        await paymentAcceptedRepo.deleteOne({
-            codeValue: PAYMENT_METHOD_TYPE,
-            project: { id: project.id },
-            seller: { id: SELLER_ID }
-        });
-        console.log('paymentAccepted deleted');
-    } catch (error) {
-        console.error(error);
-    }
-
-    paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-
-    await paymentAcceptedRepo.create({
-        codeValue: PAYMENT_METHOD_TYPE,
-        project: { id: project.id },
-        seller: { id: SELLER_ID }
-    });
-    console.log('paymentAccepted created');
-
-    paymentAccepted = await paymentAcceptedRepo.search({
-        project: { id: { $eq: project.id } },
-        seller: { id: { $eq: SELLER_ID } },
-        codeValue: { $eq: PAYMENT_METHOD_TYPE }
-    });
-    console.log('paymentAccepted:', paymentAccepted);
-    console.log(paymentAccepted.length, 'paymentAccepted found');
-}
-
-main()
-    .then()
-    .catch(console.error);