@chevre/domain 22.10.0-alpha.7 → 22.10.0-alpha.9

package/example/src/chevre/findOneAvailableHours.ts

@@ -0,0 +1,39 @@
+// tslint:disable:no-console
+import * as moment from 'moment';
+import * as mongoose from 'mongoose';
+import { chevre } from '../../../lib/index';
+
+async function main() {
+    await mongoose.connect(String(process.env.MONGOLAB_URI), { autoIndex: false });
+
+    const availableHourRepo = await chevre.repository.ServiceAvailableHour.createInstance(mongoose.connection);
+
+    const setting = await availableHourRepo.findValidOne(
+        {
+            // now: new Date(),
+            now: moment('2025-05-15T00:00:00Z')
+                .toDate()
+        },
+        ['opens', 'typeOf']
+    );
+    console.log('setting:', setting);
+    // const result = await availableHourRepo.saveOne(
+    //     {
+    //         // opens: '09:00:00',
+    //         validFrom: moment('2025-05-15T00:00:00Z')
+    //             .toDate(),
+    //         validThrough: moment('2025-05-15T01:00:00Z')
+    //             .toDate(),
+    //         typeOf: 'OpeningHoursSpecification'
+    //     }
+    // );
+    // console.log('saved', result);
+}
+
+main()
+    .then(() => {
+        console.log('success!');
+    })
+    .catch((err) => {
+        console.error(err);
+    });

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

@@ -124,7 +124,7 @@ export declare class EventRepo {
          * ドキュメント作成時には無視される
          */
         $unset?: IUnset<T>;
-        upsert?: boolean;
+        upsert: false;
     }): Promise<{
         id: string;
     }>;

package/lib/chevre/repo/event.js

@@ -525,14 +525,15 @@ class EventRepo {
                     savedEventId = id;
                 }
                 else {
-                    const upsert = params.upsert === true;
+                    // const upsert: boolean = params.upsert === true;
+                    const upsert = false; // always false(2025-05-15~)
                     doc = yield this.eventModel.findOneAndUpdate({
                         _id: { $eq: params.id },
                         typeOf: { $eq: typeOf }
                     }, Object.assign({ 
                         // 上書き禁止属性を除外(2022-08-24~)
                         $setOnInsert: Object.assign({ typeOf,
-                            project }, (identifier !== undefined) ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
+                            project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined), $set: updateFields }, (params.$unset !== undefined) ? { $unset: params.$unset } : undefined), { upsert, new: true, projection: { _id: 1 } })
                         .lean()
                         .exec();
                     savedEventId = params.id;
@@ -567,7 +568,6 @@ class EventRepo {
                                     _id: p.id,
                                     typeOf: p.attributes.typeOf
                                 },
-                                // upsertの場合、createがありうるので属性を除外しない
                                 update: Object.assign({ $setOnInsert: Object.assign(Object.assign({ typeOf: p.attributes.typeOf, project: p.attributes.project }, (typeof p.attributes.identifier === 'string')
                                         ? { identifier: p.attributes.identifier } : undefined), (typeof p.attributes.remainingAttendeeCapacity === 'number')
                                         ? { remainingAttendeeCapacity: p.attributes.remainingAttendeeCapacity }
@@ -578,29 +578,6 @@ class EventRepo {
                     }
                     else if (p.attributes.typeOf === factory.eventType.ScreeningEventSeries) {
                         throw new factory.errors.Internal('typeOf: ScreeningEventSeries discontinued');
-                        // 上書き禁止属性を除外(2022-08-24~)
-                        // const { identifier, project, typeOf, ...updateFields } = p.attributes;
-                        // bulkWriteOps.push({
-                        //     updateOne: {
-                        //         filter: {
-                        //             _id: p.id,
-                        //             typeOf: p.attributes.typeOf
-                        //         },
-                        //         // upsertの場合、createがありうるので属性を除外しない
-                        //         update: {
-                        //             $setOnInsert: {
-                        //                 typeOf: p.attributes.typeOf,
-                        //                 project: p.attributes.project,
-                        //                 ...(typeof p.attributes.identifier === 'string')
-                        //                     ? { identifier: p.attributes.identifier } : undefined
-                        //             },
-                        //             $set: updateFields,
-                        //             // $unsetに対応(2022-08-31~)
-                        //             ...(p.$unset !== undefined) ? { $unset: p.$unset } : undefined
-                        //         },
-                        //         upsert
-                        //     }
-                        // });
                     }
                 });
             }
@@ -627,7 +604,7 @@ class EventRepo {
             // upsertの場合、createがありうるので属性を除外しない
             {
                 $setOnInsert: Object.assign({ _id: id, typeOf,
-                    project }, (identifier !== undefined) ? { identifier } : undefined),
+                    project }, (typeof identifier === 'string' && identifier !== '') ? { identifier } : undefined),
                 $set: updateFields
             }, { upsert: true, new: true, projection: { _id: 1 } })
                 .lean()

package/lib/chevre/repo/mongoose/schemas/service/availableHour.d.ts

@@ -0,0 +1,18 @@
+import { IndexDefinition, IndexOptions, Model, Schema, SchemaDefinition } from 'mongoose';
+/**
+ * The place is open if the opens property is specified, and closed otherwise.
+ */
+interface IOpeningHoursSpecification {
+    typeOf: 'OpeningHoursSpecification';
+    opens?: string;
+    validFrom: Date;
+    validThrough: Date;
+}
+type IDocType = IOpeningHoursSpecification;
+type IModel = Model<IDocType>;
+type ISchemaDefinition = SchemaDefinition<IDocType>;
+type ISchema = Schema<IDocType, IModel, {}, {}, {}, {}, ISchemaDefinition, IDocType>;
+declare const modelName = "Service.AvailableHour";
+declare const indexes: [d: IndexDefinition, o: IndexOptions][];
+declare function createSchema(): ISchema;
+export { createSchema, IDocType, IModel, indexes, modelName };

package/lib/chevre/repo/mongoose/schemas/service/availableHour.js

@@ -0,0 +1,65 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.modelName = exports.indexes = void 0;
+exports.createSchema = createSchema;
+const mongoose_1 = require("mongoose");
+const settings_1 = require("../../../../settings");
+const writeConcern_1 = require("../../writeConcern");
+const modelName = 'Service.AvailableHour';
+exports.modelName = modelName;
+const schemaDefinition = {
+    typeOf: { type: String, required: true },
+    opens: { type: String, required: false },
+    validFrom: { type: Date, required: true },
+    validThrough: { type: Date, required: true }
+};
+const schemaOptions = {
+    autoIndex: settings_1.MONGO_AUTO_INDEX,
+    autoCreate: false,
+    collection: 'service.availableHours',
+    id: true,
+    read: settings_1.MONGO_READ_PREFERENCE,
+    writeConcern: writeConcern_1.writeConcern,
+    strict: true,
+    strictQuery: false,
+    timestamps: false,
+    versionKey: false,
+    toJSON: {
+        getters: false,
+        virtuals: false,
+        minimize: false,
+        versionKey: false
+    },
+    toObject: {
+        getters: false,
+        virtuals: true,
+        minimize: false,
+        versionKey: false
+    }
+};
+const indexes = [
+    [
+        { validFrom: 1 },
+        { name: 'validFrom' }
+    ],
+    [
+        { validThrough: 1, validFrom: 1 },
+        { name: 'validThrough' }
+    ]
+];
+exports.indexes = indexes;
+/**
+ * サービス利用可能時間スキーマ
+ */
+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/service/availableHour.d.ts

@@ -0,0 +1,15 @@
+import type { Connection } from 'mongoose';
+import { IDocType } from '../mongoose/schemas/service/availableHour';
+type IKeyOfProjection = keyof IDocType;
+/**
+ * サービス利用可能時間リポジトリ
+ */
+export declare class ServiceAvailableHourRepo {
+    private readonly availableHoursModel;
+    constructor(connection: Connection);
+    saveOne(params: IDocType): Promise<void>;
+    findValidOne(filter: {
+        now: Date;
+    }, inclusion: IKeyOfProjection[]): Promise<IDocType | undefined>;
+}
+export {};

package/lib/chevre/repo/service/availableHour.js

@@ -0,0 +1,53 @@
+"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.ServiceAvailableHourRepo = void 0;
+const availableHour_1 = require("../mongoose/schemas/service/availableHour");
+/**
+ * サービス利用可能時間リポジトリ
+ */
+class ServiceAvailableHourRepo {
+    constructor(connection) {
+        this.availableHoursModel = connection.model(availableHour_1.modelName, (0, availableHour_1.createSchema)());
+    }
+    saveOne(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.availableHoursModel.create(params);
+        });
+    }
+    findValidOne(filter, inclusion) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const andQuery = [];
+            const now = filter.now;
+            andQuery.push({ validFrom: { $lte: now } }, { validThrough: { $gte: now } });
+            const filterQuery = Object.assign({}, (andQuery.length > 0) ? { $and: andQuery } : undefined);
+            // eslint-disable-next-line no-magic-numbers
+            const projection = {
+                // const projection: { [key: string]: AnyExpression } = {
+                _id: 0
+                // id: { $toString: '$_id' },
+            };
+            if (Array.isArray(inclusion)) {
+                inclusion.forEach((field) => {
+                    projection[field] = 1;
+                });
+            }
+            const doc = yield this.availableHoursModel.findOne(filterQuery, projection, { sort: { validFrom: 1 } })
+                .lean()
+                .exec();
+            if (doc !== null) {
+                return doc;
+            }
+            return;
+        });
+    }
+}
+exports.ServiceAvailableHourRepo = ServiceAvailableHourRepo;

package/lib/chevre/repository.d.ts

@@ -68,6 +68,7 @@ import type { ScheduleRepo } from './repo/schedule';
 import type { SellerRepo } from './repo/seller';
 import type { SellerPaymentAcceptedRepo } from './repo/sellerPaymentAccepted';
 import type { SellerReturnPolicyRepo } from './repo/sellerReturnPolicy';
+import type { ServiceAvailableHourRepo } from './repo/service/availableHour';
 import type { ServiceOutputRepo } from './repo/serviceOutput';
 import type { ServiceOutputIdentifierRepo } from './repo/serviceOutputIdentifier';
 import type { SettingRepo } from './repo/setting';
@@ -390,6 +391,10 @@ export type SellerReturnPolicy = SellerReturnPolicyRepo;
 export declare namespace SellerReturnPolicy {
     function createInstance(...params: ConstructorParameters<typeof SellerReturnPolicyRepo>): Promise<SellerReturnPolicyRepo>;
 }
+export type ServiceAvailableHour = ServiceAvailableHourRepo;
+export declare namespace ServiceAvailableHour {
+    function createInstance(...params: ConstructorParameters<typeof ServiceAvailableHourRepo>): Promise<ServiceAvailableHourRepo>;
+}
 export type ServiceOutput = ServiceOutputRepo;
 export declare namespace ServiceOutput {
     function createInstance(...params: ConstructorParameters<typeof ServiceOutputRepo>): Promise<ServiceOutputRepo>;

package/lib/chevre/repository.js

@@ -10,7 +10,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Permit = exports.Person = exports.paymentMethod = exports.PendingReservation = exports.PaymentServiceProvider = exports.PaymentServiceChannel = 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.IdentityProvider = exports.Identity = exports.EventSeries = exports.EventSellerMakesOffer = exports.EventOffer = 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.AggregateOrder = exports.AggregateOffer = exports.AdvanceBookingRequirement = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = exports.AcceptedOffer = void 0;
-exports.WebSite = 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.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
+exports.WebSite = 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.ServiceAvailableHour = exports.SellerReturnPolicy = exports.SellerPaymentAccepted = exports.Seller = exports.Schedule = exports.Role = exports.ReserveInterface = exports.Reservation = exports.ProjectMakesOffer = exports.Project = exports.ProductOffer = exports.ProductModel = exports.Product = exports.PriceSpecification = exports.PotentialAction = exports.place = void 0;
 var AcceptedOffer;
 (function (AcceptedOffer) {
     let repo;
@@ -945,6 +945,19 @@ var SellerReturnPolicy;
     }
     SellerReturnPolicy.createInstance = createInstance;
 })(SellerReturnPolicy || (exports.SellerReturnPolicy = SellerReturnPolicy = {}));
+var ServiceAvailableHour;
+(function (ServiceAvailableHour) {
+    let repo;
+    function createInstance(...params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (repo === undefined) {
+                repo = (yield Promise.resolve().then(() => require('./repo/service/availableHour'))).ServiceAvailableHourRepo;
+            }
+            return new repo(...params);
+        });
+    }
+    ServiceAvailableHour.createInstance = createInstance;
+})(ServiceAvailableHour || (exports.ServiceAvailableHour = ServiceAvailableHour = {}));
 var ServiceOutput;
 (function (ServiceOutput) {
     let repo;

package/lib/chevre/service/assetTransaction/reserve/validateStartRequest.js

@@ -69,7 +69,7 @@ function validateMemberTier(params) {
         var _a, _b, _c, _d, _e;
         const { acceptedDate, event, availableAt, verifiedValidForMemberTier, memberProgramIdentifierMustBe } = params;
         const tierIdentifier = (_b = (_a = verifiedValidForMemberTier.member) === null || _a === void 0 ? void 0 : _a.memberOf) === null || _b === void 0 ? void 0 : _b.identifier;
-        const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTier) === null || _e === void 0 ? void 0 : _e.identifier;
+        const memberProgramIdentifier = (_e = (_d = (_c = verifiedValidForMemberTier.member) === null || _c === void 0 ? void 0 : _c.memberOf) === null || _d === void 0 ? void 0 : _d.isTierOf) === null || _e === void 0 ? void 0 : _e.identifier;
         if (typeof tierIdentifier !== 'string') {
             throw new factory.errors.Argument('reservationFor.offers.validForMemberTier', 'tier identifier must be string');
         }

package/package.json

@@ -11,7 +11,7 @@
   "dependencies": {
     "@aws-sdk/client-cognito-identity-provider": "3.600.0",
     "@aws-sdk/credential-providers": "3.600.0",
-    "@chevre/factory": "4.394.0-alpha.2",
+    "@chevre/factory": "4.394.0-alpha.3",
     "@cinerino/sdk": "10.21.0-alpha.38",
     "@motionpicture/coa-service": "9.6.0",
     "@motionpicture/gmo-service": "5.3.0",
@@ -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.7"
+  "version": "22.10.0-alpha.9"
 }