nik/OMDSCloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'develop' into main

Browse Source
This commit is contained in:
oura.a 2023-10-19 17:33:33 +09:00
commit 815082d584
7 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
azure-pipelines-staging.yml
View File

@ -76,10 +76,13 @@ jobs:
ADB2C_CLIENT_SECRET: $(adb2c-client-secret)
MAIL_FROM: xxxxxx
APP_DOMAIN: xxxxxxxxx
EMAIL_CONFIRM_LIFETIME : 0
TENANT_NAME : xxxxxxxxxxxx
SIGNIN_FLOW_NAME : xxxxxxxxxxxx
STORAGE_TOKEN_EXPIRE_TIME : 0
EMAIL_CONFIRM_LIFETIME: 0
TENANT_NAME: xxxxxxxxxxxx
SIGNIN_FLOW_NAME: xxxxxxxxxxxx
STORAGE_TOKEN_EXPIRE_TIME: 0
REFRESH_TOKEN_LIFETIME_WEB: 0
REFRESH_TOKEN_LIFETIME_DEFAULT: 0
ACCESS_TOKEN_LIFETIME_WEB: 0
- task: Docker@0
displayName: build
inputs:

8
dictation_server/src/repositories/accounts/entity/account.entity.ts
View File

@ -13,7 +13,7 @@ export class Account {
@PrimaryGeneratedColumn()
id: number;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
parent_account_id: number | null;
@Column()
@ -34,13 +34,13 @@ export class Account {
@Column({ default: false })
verified: boolean;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
primary_admin_user_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
secondary_admin_user_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
active_worktype_id: number | null;
@Column({ nullable: true, type: 'datetime' })

4
dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts
View File

@ -18,10 +18,10 @@ export class CheckoutPermission {
@Column({})
task_id: number;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
user_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
user_group_id: number | null;
@OneToOne(() => User, (user) => user.id)

12
dictation_server/src/repositories/licenses/entity/license.entity.ts
View File

@ -79,16 +79,16 @@ export class License {
@Column()
status: string;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
allocated_user_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
order_id: number | null;
@Column({ nullable: true, type: 'datetime' })
deleted_at: Date | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
delete_order_id: number | null;
@Column({ nullable: true, type: 'datetime' })
@ -244,16 +244,16 @@ export class LicenseArchive {
@Column()
status: string;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
allocated_user_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
order_id: number | null;
@Column({ nullable: true, type: 'datetime' })
deleted_at: Date | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
delete_order_id: number | null;
@Column({ nullable: true, type: 'datetime' })

4
dictation_server/src/repositories/tasks/entity/task.entity.ts
View File

@ -26,11 +26,11 @@ export class Task {
audio_file_id: number;
@Column()
status: string;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
typist_user_id: number | null;
@Column()
priority: string;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
template_file_id: number | null;
@Column({ nullable: true, type: 'datetime' })
started_at: Date | null;

4
dictation_server/src/repositories/workflows/entity/workflow.entity.ts
View File

@ -24,10 +24,10 @@ export class Workflow {
@Column()
author_id: number;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
worktype_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
template_id: number | null;
@Column({ nullable: true, type: 'datetime' })

4
dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts
View File

@ -19,10 +19,10 @@ export class WorkflowTypist {
@Column()
workflow_id: number;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
typist_id: number | null;
@Column({ nullable: true, type: 'unsigned big int' })
@Column({ nullable: true, type: 'int' })
typist_group_id: number | null;
@Column({ nullable: true, type: 'datetime' })