From 4859c83b763376c13dc0b27148451254dd44f5ab Mon Sep 17 00:00:00 2001 From: Tetsu Yamazaki Date: Wed, 14 Feb 2024 08:01:41 +0900 Subject: [PATCH 1/4] =?UTF-8?q?=E3=83=A1=E3=83=A2IF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CHANGELOG.md | 2 + src/creativeWork/noteDigitalDocument.ts | 66 +++++++++++++++++++++++++ src/creativeWorkType.ts | 1 + src/index.ts | 6 ++- 4 files changed, 73 insertions(+), 2 deletions(-) create mode 100644 src/creativeWork/noteDigitalDocument.ts diff --git a/CHANGELOG.md b/CHANGELOG.md index 6af7b7c9..c4ffe839 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,6 +8,8 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added +- メモIFを追加 + ### Changed ### Deprecated diff --git a/src/creativeWork/noteDigitalDocument.ts b/src/creativeWork/noteDigitalDocument.ts new file mode 100644 index 00000000..7663ba44 --- /dev/null +++ b/src/creativeWork/noteDigitalDocument.ts @@ -0,0 +1,66 @@ +import * as CreativeWorkFactory from '../creativeWork'; +import { CreativeWorkType } from '../creativeWorkType'; +import { IOrder } from '../order'; +import { IPerson } from '../person'; +import { IProject } from '../project'; +import { SortType } from '../sortType'; + +export type IAboutAsOrder = Pick & { + id: string; +}; +export type IAbout = IAboutAsOrder; +export type ICreator = Pick; +export type IEditor = Pick; +/** + * メモ + */ +export interface INoteDigitalDocument extends Pick { + /** + * メモ識別子 + */ + identifier: string; + /** + * メモコンテンツ + */ + text: string; + project: Pick; + about: IAbout; + dateCreated: Date; + dateModified?: Date; + creator: ICreator; // 作成者 + editor?: IEditor; // 変更者 + version: string; // バージョン + typeOf: CreativeWorkType.NoteDigitalDocument; +} + +/** + * ソート条件 + */ +export interface ISortOrder { + dateCreated?: SortType; +} + +/** + * 検索条件 + */ +export interface ISearchConditions { + limit?: number; + page?: number; + sort?: ISortOrder; + project?: { + id?: { $eq?: string }; + }; + about?: { + id?: { + $eq?: string; + $in?: string[]; + }; + orderNumber?: { + $eq?: string; + $in?: string[]; + }; + }; + identifier?: { + $eq?: string; + }; +} diff --git a/src/creativeWorkType.ts b/src/creativeWorkType.ts index 3b6589f9..9ea46bd0 100644 --- a/src/creativeWorkType.ts +++ b/src/creativeWorkType.ts @@ -5,5 +5,6 @@ export enum CreativeWorkType { Comment = 'Comment', EmailMessage = 'EmailMessage', Movie = 'Movie', + NoteDigitalDocument = 'NoteDigitalDocument', WebApplication = 'WebApplication' } diff --git a/src/index.ts b/src/index.ts index ae2cee3c..48bfa5cc 100644 --- a/src/index.ts +++ b/src/index.ts @@ -57,7 +57,8 @@ import * as ClientUserFactory from './clientUser'; import * as CreativeWorkFactory from './creativeWork'; import * as CommentFactory from './creativeWork/comment'; import * as EmailMessageFactory from './creativeWork/message/email'; -import * as MovieCreativeWorkFactory from './creativeWork/movie'; +import * as MovieFactory from './creativeWork/movie'; +import * as NoteDigitalDocumentFactory from './creativeWork/noteDigitalDocument'; import * as WebApplicationFactory from './creativeWork/softwareApplication/webApplication'; import { CreativeWorkType } from './creativeWorkType'; import * as CustomerFactory from './customer'; @@ -346,7 +347,8 @@ export namespace creativeWork { export namespace message { export import email = EmailMessageFactory; } - export import movie = MovieCreativeWorkFactory; + export import movie = MovieFactory; + export import noteDigitalDocument = NoteDigitalDocumentFactory; export namespace softwareApplication { export import webApplication = WebApplicationFactory; } From 8beb13a151a9a661439943a2399816c35a8d2ed4 Mon Sep 17 00:00:00 2001 From: Tetsu Yamazaki Date: Wed, 14 Feb 2024 13:56:17 +0900 Subject: [PATCH 2/4] =?UTF-8?q?=E3=83=A1=E3=83=A2IF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/creativeWork/noteDigitalDocument.ts | 4 ++++ src/task/onResourceUpdated.ts | 5 +++-- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/creativeWork/noteDigitalDocument.ts b/src/creativeWork/noteDigitalDocument.ts index 7663ba44..ac5b1d7f 100644 --- a/src/creativeWork/noteDigitalDocument.ts +++ b/src/creativeWork/noteDigitalDocument.ts @@ -47,6 +47,9 @@ export interface ISearchConditions { limit?: number; page?: number; sort?: ISortOrder; + id?: { + $in?: string[]; + }; project?: { id?: { $eq?: string }; }; @@ -62,5 +65,6 @@ export interface ISearchConditions { }; identifier?: { $eq?: string; + $in?: string[]; }; } diff --git a/src/task/onResourceUpdated.ts b/src/task/onResourceUpdated.ts index 3a4c5a5e..db926918 100644 --- a/src/task/onResourceUpdated.ts +++ b/src/task/onResourceUpdated.ts @@ -14,12 +14,13 @@ import { TaskName } from '../taskName'; export type AccountTitleType = IAccountTitle['typeOf']; export type CategoryCodeType = ICategoryCode['typeOf']; export type OfferCatalogType = IOfferCatalog['typeOf']; -export type IResourceTypeOf = AccountTitleType | CategoryCodeType | CreativeWorkType +export type IResourceTypeOf = AccountTitleType | CategoryCodeType + | CreativeWorkType.Movie + | CreativeWorkType.NoteDigitalDocument | EventType.ScreeningEventSeries | OrganizationType.Corporation | PlaceType.MovieTheater | ProductType | OfferCatalogType | OfferType.AggregateOffer; -// | OfferType.Offer; export interface IData4common { id: string[]; project: { id: string }; From 531d303ba14ae82ac8331387d03e10cccb908e5f Mon Sep 17 00:00:00 2001 From: Tetsu Yamazaki Date: Thu, 15 Feb 2024 08:28:40 +0900 Subject: [PATCH 3/4] =?UTF-8?q?=E3=83=A1=E3=83=A2IF=E3=82=92=E8=BF=BD?= =?UTF-8?q?=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/creativeWork/noteDigitalDocument.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/creativeWork/noteDigitalDocument.ts b/src/creativeWork/noteDigitalDocument.ts index ac5b1d7f..2a516384 100644 --- a/src/creativeWork/noteDigitalDocument.ts +++ b/src/creativeWork/noteDigitalDocument.ts @@ -37,7 +37,7 @@ export interface INoteDigitalDocument extends Pick Date: Thu, 15 Feb 2024 08:30:42 +0900 Subject: [PATCH 4/4] release v4.354.0 --- CHANGELOG.md | 8 ++++++-- package-lock.json | 4 ++-- package.json | 2 +- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c4ffe839..f5c41d43 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -8,8 +8,6 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Added -- メモIFを追加 - ### Changed ### Deprecated @@ -20,6 +18,12 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ### Security +## v4.354.0 - 2024-02-15 + +### Added + +- メモIFを追加 + ## v4.353.0 - 2024-02-11 ### Added diff --git a/package-lock.json b/package-lock.json index 80141988..dba4997d 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "@chevre/factory", - "version": "4.353.0", + "version": "4.354.0", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "@chevre/factory", - "version": "4.353.0", + "version": "4.354.0", "license": "UNLICENSED", "dependencies": { "@aws-sdk/client-cognito-identity-provider": "3.438.0", diff --git a/package.json b/package.json index e0e46197..d1404505 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@chevre/factory", - "version": "4.353.0", + "version": "4.354.0", "description": "Chevre Factory Library for Javascript", "main": "./lib/index.js", "types": "./lib/index.d.ts",