From 81d966ad1f234dfeba32f659841f0962528923a2 Mon Sep 17 00:00:00 2001 From: "oura.a" Date: Mon, 23 Oct 2023 06:54:00 +0000 Subject: [PATCH] Merged PR 515: Revert "Merge branch 'develop' into main" Revert "Merge branch 'develop' into main" Reverted commit `815082d5`. --- azure-pipelines-staging.yml | 11 ++++------- .../repositories/accounts/entity/account.entity.ts | 8 ++++---- .../entity/checkout_permission.entity.ts | 4 ++-- .../repositories/licenses/entity/license.entity.ts | 12 ++++++------ .../src/repositories/tasks/entity/task.entity.ts | 4 ++-- .../repositories/workflows/entity/workflow.entity.ts | 4 ++-- .../workflows/entity/workflow_typists.entity.ts | 4 ++-- 7 files changed, 22 insertions(+), 25 deletions(-) diff --git a/azure-pipelines-staging.yml b/azure-pipelines-staging.yml index 46175dc..22dd085 100644 --- a/azure-pipelines-staging.yml +++ b/azure-pipelines-staging.yml @@ -76,13 +76,10 @@ 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 - REFRESH_TOKEN_LIFETIME_WEB: 0 - REFRESH_TOKEN_LIFETIME_DEFAULT: 0 - ACCESS_TOKEN_LIFETIME_WEB: 0 + EMAIL_CONFIRM_LIFETIME : 0 + TENANT_NAME : xxxxxxxxxxxx + SIGNIN_FLOW_NAME : xxxxxxxxxxxx + STORAGE_TOKEN_EXPIRE_TIME : 0 - task: Docker@0 displayName: build inputs: diff --git a/dictation_server/src/repositories/accounts/entity/account.entity.ts b/dictation_server/src/repositories/accounts/entity/account.entity.ts index 7663f47..74a0a0a 100644 --- a/dictation_server/src/repositories/accounts/entity/account.entity.ts +++ b/dictation_server/src/repositories/accounts/entity/account.entity.ts @@ -13,7 +13,7 @@ export class Account { @PrimaryGeneratedColumn() id: number; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) parent_account_id: number | null; @Column() @@ -34,13 +34,13 @@ export class Account { @Column({ default: false }) verified: boolean; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) primary_admin_user_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) secondary_admin_user_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) active_worktype_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts b/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts index 2ff148e..1269c1f 100644 --- a/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts +++ b/dictation_server/src/repositories/checkout_permissions/entity/checkout_permission.entity.ts @@ -18,10 +18,10 @@ export class CheckoutPermission { @Column({}) task_id: number; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) user_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) user_group_id: number | null; @OneToOne(() => User, (user) => user.id) diff --git a/dictation_server/src/repositories/licenses/entity/license.entity.ts b/dictation_server/src/repositories/licenses/entity/license.entity.ts index c3adf94..b8e2cd2 100644 --- a/dictation_server/src/repositories/licenses/entity/license.entity.ts +++ b/dictation_server/src/repositories/licenses/entity/license.entity.ts @@ -79,16 +79,16 @@ export class License { @Column() status: string; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) allocated_user_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) order_id: number | null; @Column({ nullable: true, type: 'datetime' }) deleted_at: Date | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big 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: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) allocated_user_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) order_id: number | null; @Column({ nullable: true, type: 'datetime' }) deleted_at: Date | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) delete_order_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/tasks/entity/task.entity.ts b/dictation_server/src/repositories/tasks/entity/task.entity.ts index 27da363..c734e1f 100644 --- a/dictation_server/src/repositories/tasks/entity/task.entity.ts +++ b/dictation_server/src/repositories/tasks/entity/task.entity.ts @@ -26,11 +26,11 @@ export class Task { audio_file_id: number; @Column() status: string; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) typist_user_id: number | null; @Column() priority: string; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) template_file_id: number | null; @Column({ nullable: true, type: 'datetime' }) started_at: Date | null; diff --git a/dictation_server/src/repositories/workflows/entity/workflow.entity.ts b/dictation_server/src/repositories/workflows/entity/workflow.entity.ts index 52af3e2..6c51d96 100644 --- a/dictation_server/src/repositories/workflows/entity/workflow.entity.ts +++ b/dictation_server/src/repositories/workflows/entity/workflow.entity.ts @@ -24,10 +24,10 @@ export class Workflow { @Column() author_id: number; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) worktype_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) template_id: number | null; @Column({ nullable: true, type: 'datetime' }) diff --git a/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts b/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts index 31f8cbd..f92d02e 100644 --- a/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts +++ b/dictation_server/src/repositories/workflows/entity/workflow_typists.entity.ts @@ -19,10 +19,10 @@ export class WorkflowTypist { @Column() workflow_id: number; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) typist_id: number | null; - @Column({ nullable: true, type: 'int' }) + @Column({ nullable: true, type: 'unsigned big int' }) typist_group_id: number | null; @Column({ nullable: true, type: 'datetime' })