@chevre/domain 20.1.0-alpha.25 → 20.1.0-alpha.27

package/example/src/chevre/migrateCreativeWorkAdditionalProperties.ts

@@ -11,19 +11,27 @@ const EXCLUDED_PROJECT_ID = process.env.EXCLUDED_PROJECT_ID;
 async function main() {
     await mongoose.connect(<string>process.env.MONGOLAB_URI);
 
-    // const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
+    // const customerRepo = new chevre.repository.Customer(mongoose.connection);
+    // const sellerRepo = new chevre.repository.Seller(mongoose.connection);
+    // const eventRepo = new chevre.repository.Event(mongoose.connection);
+    const creativeWorkRepo = new chevre.repository.CreativeWork(mongoose.connection);
     // const placeRepo = new chevre.repository.Place(mongoose.connection);
     // const offerRepo = new chevre.repository.Offer(mongoose.connection);
-    const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
+    // const categoryCodeRepo = new chevre.repository.CategoryCode(mongoose.connection);
     // const additionalPropertyRepo = new chevre.repository.AdditionalProperty(mongoose.connection);
 
-    const cursor = categoryCodeRepo.getCursor(
-        // const cursor = offerRepo.getCursor(
-        // const cursor = creativeWorkRepo.getCursor(
+    // const cursor = customerRepo.getCursor(
+    // const cursor = sellerRepo.getCursor(
+    // const cursor = eventRepo.getCursor(
+    // const cursor = categoryCodeRepo.getCursor(
+    // const cursor = offerRepo.getCursor(
+    const cursor = creativeWorkRepo.getCursor(
         // const cursor = placeRepo.getCursor(
         {
             // 'project.id': { $eq: project.id },
-            'project.id': { $ne: EXCLUDED_PROJECT_ID }
+            'project.id': { $ne: EXCLUDED_PROJECT_ID },
+            // typeOf: { $eq: chevre.factory.eventType.ScreeningEventSeries },
+            // starDate: { $gte: new Date() }
             // _id: { $eq: 'al6aff83w' }
         },
         {
@@ -34,6 +42,7 @@ async function main() {
 
     const additionalPropertyNames: string[] = [];
     const projectIds: string[] = [];
+    const unexpextedprojectIds: string[] = [];
 
     let i = 0;
     let updateCount = 0;
@@ -43,16 +52,23 @@ async function main() {
 
         const additionalPropertyNamesOnEvent = creativeWork.additionalProperty?.map((p) => p.name);
         if (Array.isArray(additionalPropertyNamesOnEvent) && additionalPropertyNamesOnEvent.length > 0) {
-            console.log(additionalPropertyNamesOnEvent.length, 'additionalPropertyNamesOnEvent found', creativeWork.project.id);
+            console.log(
+                additionalPropertyNamesOnEvent.length,
+                'additionalPropertyNamesOnEvent found',
+                creativeWork.project.id,
+                creativeWork.id
+            );
             additionalPropertyNames.push(...additionalPropertyNamesOnEvent);
             projectIds.push(creativeWork.project.id);
             additionalPropertyNamesOnEvent.forEach((name) => {
                 if (!name.match(/^[a-zA-Z]*$/)) {
                     // throw new Error(`not matched ${creativeWork.project.id} ${creativeWork.id}`);
+                    unexpextedprojectIds.push(creativeWork.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(creativeWork.project.id);
                 }
             });
 
@@ -88,6 +104,7 @@ async function main() {
     console.log(updateCount, 'events updated');
     console.log([...new Set(additionalPropertyNames)]);
     console.log([...new Set(projectIds)]);
+    console.log([...new Set(unexpextedprojectIds)]);
 }
 
 main()

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

@@ -21,4 +21,5 @@ export declare class MongoRepository {
     deleteById(params: {
         id: string;
     }): Promise<void>;
+    getCursor(conditions: any, projection: any): import("mongoose").QueryCursor<any>;
 }

package/lib/chevre/repo/customer.js

@@ -130,5 +130,10 @@ class MongoRepository {
                 .exec();
         });
     }
+    getCursor(conditions, projection) {
+        return this.customerModel.find(conditions, projection)
+            .sort({ branchCode: factory.sortType.Ascending })
+            .cursor();
+    }
 }
 exports.MongoRepository = MongoRepository;

package/lib/chevre/repository.d.ts

@@ -2,7 +2,6 @@
  * リポジトリ
  */
 import { MongoRepository as AccountRepo } from './repo/account';
-import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 import { MongoRepository as AccountingReportRepo } from './repo/accountingReport';
 import { MongoRepository as AccountTitleRepo } from './repo/accountTitle';
 import { MongoRepository as AccountTransactionRepo } from './repo/accountTransaction';
@@ -50,8 +49,6 @@ export declare class Account extends AccountRepo {
 /**
  * 口座アクションリポジトリ
  */
-export declare class AccountAction extends AccountActionRepo {
-}
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/repository.js

@@ -1,12 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.AccountAction = exports.Account = void 0;
+exports.rateLimit = exports.itemAvailability = exports.TransactionNumber = exports.Transaction = exports.Telemetry = exports.Task = exports.ServiceOutputIdentifier = exports.ServiceOutput = exports.Seller = exports.Role = exports.Reservation = exports.Project = exports.Product = exports.PriceSpecification = exports.Place = exports.Permit = exports.Person = exports.paymentMethod = exports.OwnershipInfo = exports.OrderNumber = exports.Order = exports.OfferCatalog = exports.Offer = exports.MerchantReturnPolicy = exports.Member = exports.Event = exports.EmailMessage = exports.Customer = exports.CreativeWork = exports.ConfirmationNumber = exports.Code = exports.CategoryCode = exports.AssetTransaction = exports.action = exports.AdditionalProperty = exports.Action = exports.AccountTransaction = exports.AccountTitle = exports.AccountingReport = exports.Account = void 0;
 // tslint:disable:max-classes-per-file completed-docs
 /**
  * リポジトリ
  */
 const account_1 = require("./repo/account");
-const accountAction_1 = require("./repo/accountAction");
+// import { MongoRepository as AccountActionRepo } from './repo/accountAction';
 const accountingReport_1 = require("./repo/accountingReport");
 const accountTitle_1 = require("./repo/accountTitle");
 const accountTransaction_1 = require("./repo/accountTransaction");
@@ -55,9 +55,7 @@ exports.Account = Account;
 /**
  * 口座アクションリポジトリ
  */
-class AccountAction extends accountAction_1.MongoRepository {
-}
-exports.AccountAction = AccountAction;
+// export class AccountAction extends AccountActionRepo { }
 /**
  * 経理レポートリポジトリ
  */

package/lib/chevre/service/event.js

@@ -475,7 +475,7 @@ function createScreeningEventAdditionalPropertyFromCOA(params) {
     return {
         coaInfo,
         additionalProperty: [
-            { name: 'COA_ENDPOINT', value: credentials_1.credentials.coa.endpoint },
+            // { name: 'COA_ENDPOINT', value: credentials.coa.endpoint },
             { name: 'coaInfo', value: JSON.stringify(coaInfo) }
         ]
     };
@@ -579,7 +579,7 @@ function createScreeningEventSeriesAdditionalPropertyFromCOA(params) {
     return {
         coaInfo,
         additionalProperty: [
-            { name: 'COA_ENDPOINT', value: credentials_1.credentials.coa.endpoint },
+            // { name: 'COA_ENDPOINT', value: credentials.coa.endpoint },
             { name: 'coaInfo', value: JSON.stringify(coaInfo) }
         ]
     };

package/lib/chevre/service/offer/eventServiceByCOA/factory.js

@@ -82,7 +82,6 @@ function responseBody2acceptedOffers4result(params) {
             coaInfo = event.coaInfo;
         }
         else {
-            // const coaEndpointProperty = event.additionalProperty.find((p) => p.name === 'COA_ENDPOINT');
             const coaInfoProperty = (_a = event.additionalProperty) === null || _a === void 0 ? void 0 : _a.find((p) => p.name === 'coaInfo');
             coaInfo = (coaInfoProperty !== undefined) ? JSON.parse(coaInfoProperty.value) : undefined;
         }

package/package.json

@@ -120,5 +120,5 @@
     "postversion": "git push origin --tags",
     "prepublishOnly": "npm run clean && npm run build && npm test && npm run doc"
   },
-  "version": "20.1.0-alpha.25"
+  "version": "20.1.0-alpha.27"
 }

package/example/src/chevre/migrateSection.ts

@@ -1,105 +0,0 @@
-// tslint:disable:no-console no-magic-numbers
-// import * as moment from 'moment';
-import * as mongoose from 'mongoose';
-import * as redis from 'redis';
-
-import { chevre } from '../../../lib/index';
-
-async function main() {
-    await mongoose.connect(<string>process.env.MONGOLAB_URI);
-
-    const client = redis.createClient({
-        host: <string>process.env.REDIS_HOST,
-        port: Number(process.env.REDIS_PORT),
-        password: <string>process.env.REDIS_KEY
-    });
-
-    const eventRepo = new chevre.repository.Event(mongoose.connection);
-
-    const events = await eventRepo.search({
-        typeOf: chevre.factory.eventType.ScreeningEvent,
-        project: { id: { $eq: '' } },
-        startFrom: new Date()
-        // startThrough: moment().add(4, 'day').toDate()
-    });
-    console.log(events.length, 'events found');
-
-    const sectionCode = 'Default';
-    await Promise.all(events.map(async (event) => {
-        await new Promise<void>((resolve) => {
-            const key = `chevre:itemAvailability:screeningEvent:${event.id}`;
-            client.hgetall(key, async (__, reply) => {
-                if (reply !== null && Object.keys(reply).length > 0) {
-
-                    const fieldAndValues = reply;
-                    for (const field of Object.keys(fieldAndValues)) {
-                        // セクションがなければキーを更新
-                        if (field.slice(0, 7) !== sectionCode) {
-                            console.log(event.id, field);
-                            const newField = `${sectionCode}${field}`;
-                            const newValue = fieldAndValues[field];
-                            console.log('saving...', newField, newValue);
-
-                            await new Promise<void>((resolveSet) => {
-                                client.hsetnx(key, newField, newValue, (___, setReply) => {
-                                    console.log('set', setReply, newField, newValue);
-
-                                    resolveSet();
-                                });
-                            });
-
-                            // 元のフィールドを削除
-                            await new Promise<void>((resolveSet) => {
-                                client.hdel(key, field, (___, setReply) => {
-                                    console.log('deleted', setReply, field);
-
-                                    resolveSet();
-                                });
-                            });
-                        }
-                    }
-                }
-
-                resolve();
-                // if (err !== null) {
-                //     reject(err);
-                // } else {
-                //     if (reply !== null) {
-                //         client.ttl(targetKey, (ttlErr, ttl) => {
-                //             console.log('ttl:', ttl);
-                //             const args = Object.keys(reply)
-                //                 .reduce(
-                //                     (a, b) => {
-                //                         return [...a, b, reply[b]];
-                //                     },
-                //                     []
-                //                 );
-                //             console.log(args.length, 'args ready');
-
-                //             newClient.multi()
-                //                 .hmset(newKey, ...args)
-                //                 .expire(newKey, ttl)
-                //                 .exec((hmsetErr, reply) => {
-                //                     console.log('hmset result:', hmsetErr, reply);
-                //                     resolve();
-                //                 });
-                //         });
-                //     } else {
-                //         console.error('targetKey not found');
-                //     }
-                // }
-            });
-        });
-    }));
-
-    // client.keys('chevre:itemAvailability:screeningEvent:*', async (err, reply) => {
-    //     console.log(err, reply.length, 'keys found');
-    //     const targetKeys = reply;
-
-    // });
-
-}
-
-main()
-    .then(console.log)
-    .catch(console.error);