Skip to content

Commit

Permalink
Merge branch 'release/4.354.0'
Browse files Browse the repository at this point in the history
  • Loading branch information
ilovegadd committed Feb 14, 2024
2 parents 51962c0 + 6f7529a commit 2f31ce0
Show file tree
Hide file tree
Showing 7 changed files with 87 additions and 7 deletions.
6 changes: 6 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,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
Expand Down
4 changes: 2 additions & 2 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -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",
Expand Down
70 changes: 70 additions & 0 deletions src/creativeWork/noteDigitalDocument.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,70 @@
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<IOrder, 'orderNumber' | 'typeOf'> & {
id: string;
};
export type IAbout = IAboutAsOrder;
export type ICreator = Pick<IPerson, 'id' | 'typeOf'>;
export type IEditor = Pick<IPerson, 'id' | 'typeOf'>;
/**
* メモ
*/
export interface INoteDigitalDocument extends Pick<CreativeWorkFactory.ICreativeWork, 'id' | 'typeOf'> {
/**
* メモ識別子
*/
identifier: string;
/**
* メモコンテンツ
*/
text: string;
project: Pick<IProject, 'id' | 'typeOf'>;
about: IAbout;
dateCreated: Date;
dateModified?: Date;
creator: ICreator; // 作成者
editor?: IEditor; // 変更者
version: string; // バージョン
typeOf: CreativeWorkType.NoteDigitalDocument;
}

/**
* ソート条件
*/
export interface ISortOrder {
identifier?: SortType;
}

/**
* 検索条件
*/
export interface ISearchConditions {
limit?: number;
page?: number;
sort?: ISortOrder;
id?: {
$in?: string[];
};
project?: {
id?: { $eq?: string };
};
about?: {
id?: {
$eq?: string;
$in?: string[];
};
orderNumber?: {
$eq?: string;
$in?: string[];
};
};
identifier?: {
$eq?: string;
$in?: string[];
};
}
1 change: 1 addition & 0 deletions src/creativeWorkType.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,6 @@ export enum CreativeWorkType {
Comment = 'Comment',
EmailMessage = 'EmailMessage',
Movie = 'Movie',
NoteDigitalDocument = 'NoteDigitalDocument',
WebApplication = 'WebApplication'
}
6 changes: 4 additions & 2 deletions src/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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;
}
Expand Down
5 changes: 3 additions & 2 deletions src/task/onResourceUpdated.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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 };
Expand Down

0 comments on commit 2f31ce0

Please sign in to comment.