diff --git a/package.json b/package.json index e35cde77..26d7ae30 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "swagger-client": "2.1.18", "tedious": "14.0.0", "textract": "2.5.0", - "typescript": "3.6.4", + "typescript": "3.6.4", "url-join": "4.0.1", "vbscript-to-typescript": "1.0.8", "walk-promise": "0.2.0", diff --git a/packages/analytics.gblib/models/index.ts b/packages/analytics.gblib/models/index.ts index f2017012..09f19de6 100644 --- a/packages/analytics.gblib/models/index.ts +++ b/packages/analytics.gblib/models/index.ts @@ -66,29 +66,28 @@ export class GuaribasConversation extends Model { @PrimaryKey @AutoIncrement - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public conversationId: number; @ForeignKey(() => GuaribasInstance) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @ForeignKey(() => GuaribasSubject) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public startSubjectId: number; @BelongsTo(() => GuaribasSubject) public startSubject: GuaribasSubject; @ForeignKey(() => GuaribasChannel) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public channelId: string; @Column(DataType.DATE) public rateDate: Date; @Column(DataType.FLOAT) - public rate: number; @Column(DataType.STRING(512)) @@ -117,11 +116,11 @@ export class GuaribasConversationMessage extends Model GuaribasSubject) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public subjectId: number; @Column(DataType.TEXT) @@ -138,7 +137,7 @@ export class GuaribasConversationMessage extends Model GuaribasConversation) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public conversationId: number; //tslint:disable-next-line:no-use-before-declare @@ -146,11 +145,11 @@ export class GuaribasConversationMessage extends Model GuaribasInstance) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @ForeignKey(() => GuaribasUser) - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public userId: number; @BelongsTo(() => GuaribasUser) diff --git a/packages/basic.gblib/models/Model.ts b/packages/basic.gblib/models/Model.ts index b1b19764..279ceaaa 100644 --- a/packages/basic.gblib/models/Model.ts +++ b/packages/basic.gblib/models/Model.ts @@ -62,7 +62,7 @@ export class GuaribasSchedule extends Model { public schedule: string; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance) diff --git a/packages/core.gbapp/models/GBModel.ts b/packages/core.gbapp/models/GBModel.ts index 7da5f69e..93cc9864 100644 --- a/packages/core.gbapp/models/GBModel.ts +++ b/packages/core.gbapp/models/GBModel.ts @@ -278,7 +278,7 @@ export class GuaribasInstance extends Model export class GuaribasPackage extends Model { @PrimaryKey @AutoIncrement - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public packageId: number; @Column(DataType.STRING(255)) @@ -310,7 +310,7 @@ export class GuaribasPackage extends Model { export class GuaribasChannel extends Model { @PrimaryKey @AutoIncrement - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public channelId: number; @Column(DataType.STRING(255)) diff --git a/packages/customer-satisfaction.gbapp/models/index.ts b/packages/customer-satisfaction.gbapp/models/index.ts index c88179b2..1cc3ea1b 100644 --- a/packages/customer-satisfaction.gbapp/models/index.ts +++ b/packages/customer-satisfaction.gbapp/models/index.ts @@ -44,7 +44,8 @@ import { ForeignKey, Model, PrimaryKey, - Table} from 'sequelize-typescript'; + Table +} from 'sequelize-typescript'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; @@ -56,17 +57,17 @@ export class GuaribasQuestionAlternate extends Model @PrimaryKey @AutoIncrement - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public quickAnswerId: number; - @Column (DataType.STRING(255)) -public questionTyped: string; + @Column(DataType.STRING(255)) + public questionTyped: string; - @Column (DataType.STRING(255)) -public questionText: string; + @Column(DataType.STRING(255)) + public questionText: string; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance) diff --git a/packages/kb.gbapp/models/index.ts b/packages/kb.gbapp/models/index.ts index a72aefbc..46cec429 100644 --- a/packages/kb.gbapp/models/index.ts +++ b/packages/kb.gbapp/models/index.ts @@ -67,27 +67,26 @@ import { GuaribasUser } from '../../security.gbapp/models'; export class GuaribasSubject extends Model { @PrimaryKey @AutoIncrement - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public subjectId: number; - @Column (DataType.STRING(255)) -public internalId: string; + @Column(DataType.INTEGER) + public internalId: string; - @Column (DataType.STRING(255)) -public title: string; + @Column(DataType.STRING(255)) + public title: string; @Column(DataType.STRING(512)) - @Column (DataType.STRING(255)) public description: string; - @Column (DataType.STRING(255)) -public from: string; + @Column(DataType.STRING(255)) + public from: string; - @Column (DataType.STRING(255)) -public to: string; + @Column(DataType.STRING(255)) + public to: string; @ForeignKey(() => GuaribasSubject) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public parentSubjectId: number; @BelongsTo(() => GuaribasSubject, 'parentSubjectId') @@ -97,21 +96,21 @@ public to: string; public childrenSubjects: GuaribasSubject[]; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance) public instance: GuaribasInstance; @ForeignKey(() => GuaribasUser) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public responsibleUserId: number; @BelongsTo(() => GuaribasUser) public responsibleUser: GuaribasUser; @ForeignKey(() => GuaribasPackage) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public packageId: number; @BelongsTo(() => GuaribasPackage) @@ -125,30 +124,25 @@ public to: string; export class GuaribasQuestion extends Model { @PrimaryKey @AutoIncrement - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public questionId: number; @Column(DataType.STRING(64)) - @Column (DataType.STRING(255)) public subject1: string; @Column(DataType.STRING(64)) - @Column (DataType.STRING(255)) public subject2: string; @Column(DataType.STRING(64)) - @Column (DataType.STRING(255)) public subject3: string; @Column(DataType.STRING(64)) - @Column (DataType.STRING(255)) public subject4: string; @Column(DataType.STRING(1024)) - @Column (DataType.STRING(255)) public keywords: string; - @Column (DataType.STRING(255)) + @Column(DataType.BOOLEAN) public skipIndex: boolean; @Column(DataType.STRING(512)) @@ -160,7 +154,7 @@ export class GuaribasQuestion extends Model { @Column(DataType.TEXT) public content: string; - @Column(DataType.DATE) + @Column(DataType.DATE) @CreatedAt public createdAt: Date; @@ -171,18 +165,18 @@ export class GuaribasQuestion extends Model { //tslint:disable-next-line:no-use-before-declare @ForeignKey(() => GuaribasAnswer) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public answerId: number; @BelongsTo(() => GuaribasInstance) public instance: GuaribasInstance; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @ForeignKey(() => GuaribasPackage) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public packageId: number; @BelongsTo(() => GuaribasPackage) @@ -196,21 +190,21 @@ export class GuaribasQuestion extends Model { export class GuaribasAnswer extends Model { @PrimaryKey @AutoIncrement - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public answerId: number; @Length({ min: 0, max: 512 }) - @Column (DataType.STRING(255)) + @Column(DataType.STRING(512)) public media: string; @Length({ min: 0, max: 12 }) - @Column (DataType.STRING(255)) + @Column(DataType.STRING(12)) public format: string; @Column(DataType.TEXT) public content: string; - @Column(DataType.DATE) + @Column(DataType.DATE) @CreatedAt public createdAt: Date; @@ -229,19 +223,19 @@ export class GuaribasAnswer extends Model { public next: GuaribasQuestion; @ForeignKey(() => GuaribasQuestion) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public nextId: number; @ForeignKey(() => GuaribasQuestion) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public prevId: number; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @ForeignKey(() => GuaribasPackage) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public packageId: number; @BelongsTo(() => GuaribasPackage) diff --git a/packages/security.gbapp/models/index.ts b/packages/security.gbapp/models/index.ts index 4ae5a401..f82b7b1f 100644 --- a/packages/security.gbapp/models/index.ts +++ b/packages/security.gbapp/models/index.ts @@ -45,7 +45,8 @@ import { Length, Model, PrimaryKey, - Table} from 'sequelize-typescript'; + Table +} from 'sequelize-typescript'; import { GuaribasInstance } from '../../core.gbapp/models/GBModel'; @@ -59,42 +60,40 @@ export class GuaribasUser extends Model { @Column(DataType.INTEGER) public userId: number; - @Column (DataType.STRING(255)) -public displayName: string; + @Column(DataType.STRING(255)) + public displayName: string; - @Column (DataType.STRING(255)) -public userSystemId: string; - @Column (DataType.STRING(255)) -public userName: string; + @Column(DataType.INTEGER) + public userSystemId: string; + @Column(DataType.STRING(255)) + public userName: string; - @Column (DataType.STRING(255)) -public defaultChannel: string; + @Column(DataType.STRING(255)) + public defaultChannel: string; - @Column (DataType.STRING(255)) -public email: string; + @Column(DataType.STRING(255)) + public email: string; @Column(DataType.STRING(5)) public locale: string; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance) public instance: GuaribasInstance; - @Column(DataType.STRING(255)) + @Column(DataType.INTEGER) public agentSystemId: string; @Column(DataType.DATE) - @Column (DataType.STRING(255)) public agentContacted: Date; @Column(DataType.STRING(16)) public agentMode: string; @Column(DataType.TEXT) - @Column (DataType.STRING(255)) public conversationReference: string; @Column(DataType.STRING(64)) @@ -108,15 +107,15 @@ public email: string; export class GuaribasGroup extends Model { @PrimaryKey @AutoIncrement - @Column (DataType.STRING(255)) - public groupId: number; + @Column(DataType.INTEGER) + public groupId: number; @Length({ min: 0, max: 512 }) - @Column (DataType.STRING(255)) + @Column(DataType.STRING(512)) public displayName: string; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance) @@ -129,15 +128,15 @@ export class GuaribasGroup extends Model { @Table export class GuaribasUserGroup extends Model { @ForeignKey(() => GuaribasUser) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public userId: number; @ForeignKey(() => GuaribasGroup) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public groupId: number; @ForeignKey(() => GuaribasInstance) - @Column (DataType.STRING(255)) + @Column(DataType.INTEGER) public instanceId: number; @BelongsTo(() => GuaribasInstance)