Update seed default values (twentyhq#2681)

* Update seed default values * Update seed default values * Update seed default values * remove allowImpersonation in workspaceMembers * remove USD from currencyCode defaultValue * fix tests
alfredlouisw8 · Nov 23, 2023 · 5038c36 · 5038c36
1 parent a0478a0
commit 5038c36
Show file tree

Hide file tree

Showing 38 changed files with 90 additions and 86 deletions.
diff --git a/server/src/core/auth/auth.resolver.spec.ts b/server/src/core/auth/auth.resolver.spec.ts
@@ -16,7 +16,7 @@ describe('AuthResolver', () => {
       providers: [
         AuthResolver,
         {
-          provide: getRepositoryToken(Workspace),
+          provide: getRepositoryToken(Workspace, 'core'),
           useValue: {},
         },
         {

diff --git a/server/src/core/auth/services/auth.service.spec.ts b/server/src/core/auth/services/auth.service.spec.ts
@@ -34,11 +34,11 @@ describe('AuthService', () => {
           useValue: {},
         },
         {
-          provide: getRepositoryToken(Workspace),
+          provide: getRepositoryToken(Workspace, 'core'),
           useValue: {},
         },
         {
-          provide: getRepositoryToken(User),
+          provide: getRepositoryToken(User, 'core'),
           useValue: {},
         },
       ],

diff --git a/server/src/core/auth/services/token.service.spec.ts b/server/src/core/auth/services/token.service.spec.ts
@@ -24,11 +24,11 @@ describe('TokenService', () => {
           useValue: {},
         },
         {
-          provide: getRepositoryToken(User),
+          provide: getRepositoryToken(User, 'core'),
           useValue: {},
         },
         {
-          provide: getRepositoryToken(RefreshToken),
+          provide: getRepositoryToken(RefreshToken, 'core'),
           useValue: {},
         },
       ],

diff --git a/server/src/core/user/services/user.service.spec.ts b/server/src/core/user/services/user.service.spec.ts
@@ -15,7 +15,7 @@ describe('UserService', () => {
       providers: [
         UserService,
         {
-          provide: getRepositoryToken(User),
+          provide: getRepositoryToken(User, 'core'),
           useValue: {},
         },
         {

diff --git a/server/src/core/workspace/services/workspace.service.spec.ts b/server/src/core/workspace/services/workspace.service.spec.ts
@@ -14,7 +14,7 @@ describe('WorkspaceService', () => {
       providers: [
         WorkspaceService,
         {
-          provide: getRepositoryToken(Workspace),
+          provide: getRepositoryToken(Workspace, 'core'),
           useValue: {},
         },
         {

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/activity.ts
@@ -124,7 +124,7 @@ export const seedActivityFieldMetadata = async (
         icon: 'IconNotes',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
 
       // Scalar fields
@@ -144,7 +144,7 @@ export const seedActivityFieldMetadata = async (
         icon: 'IconList',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedActivityFieldMetadataIds.Type,
@@ -162,7 +162,7 @@ export const seedActivityFieldMetadata = async (
         icon: 'IconCheckbox',
         isNullable: false,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: 'Note' },
       },
       {
         id: SeedActivityFieldMetadataIds.ReminderAt,

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/api-key.ts
@@ -113,7 +113,7 @@ export const seedApiKeyFieldMetadata = async (
         icon: 'IconLink',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedApiKeyFieldMetadataIds.ExpiresAt,

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/company.ts
@@ -147,7 +147,7 @@ export const seedCompanyFieldMetadata = async (
         icon: 'IconLink',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedCompanyFieldMetadataIds.Address,
@@ -165,7 +165,7 @@ export const seedCompanyFieldMetadata = async (
         icon: 'IconMap',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedCompanyFieldMetadataIds.Employees,

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/opportunity.ts
@@ -155,11 +155,11 @@ export const seedOpportunityFieldMetadata = async (
         targetColumnMap: {
           value: 'probability',
         },
-        description: 'Opportunity amount',
+        description: 'Opportunity probability',
         icon: 'IconProgressCheck',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '0' },
       },
       // Relationships
       {

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/person.ts
@@ -204,7 +204,7 @@ export const seedPersonFieldMetadata = async (
         icon: 'IconBriefcase',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedPersonFieldMetadataIds.Phone,
@@ -222,7 +222,7 @@ export const seedPersonFieldMetadata = async (
         icon: 'IconPhone',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedPersonFieldMetadataIds.City,
@@ -240,7 +240,7 @@ export const seedPersonFieldMetadata = async (
         icon: 'IconMap',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
       {
         id: SeedPersonFieldMetadataIds.AvatarUrl,
@@ -258,7 +258,7 @@ export const seedPersonFieldMetadata = async (
         icon: 'IconFileUpload',
         isNullable: true,
         isSystem: true,
-        defaultValue: undefined,
+        defaultValue: { value: '' },
       },
 
       // Relationships

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-field.ts
@@ -106,7 +106,7 @@ export const seedViewFieldFieldMetadata = async (
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'fieldMetadataId',
         label: 'Field Metadata Id',
         targetColumnMap: {
@@ -116,7 +116,7 @@ export const seedViewFieldFieldMetadata = async (
         icon: 'IconTag',
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: '' },
+        defaultValue: undefined,
       },
       {
         id: SeedViewFieldFieldMetadataIds.View,

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-filter.ts
@@ -106,7 +106,7 @@ export const seedViewFilterFieldMetadata = async (
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'fieldMetadataId',
         label: 'Field Metadata Id',
         targetColumnMap: {
@@ -116,15 +116,15 @@ export const seedViewFilterFieldMetadata = async (
         icon: null,
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: '' },
+        defaultValue: undefined,
       },
       {
         id: SeedViewFilterFieldMetadataIds.View,
         objectMetadataId: SeedObjectMetadataIds.ViewFilter,
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'viewId',
         label: 'View Id',
         targetColumnMap: {},

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view-sort.ts
@@ -104,7 +104,7 @@ export const seedViewSortFieldMetadata = async (
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'fieldMetadataId',
         label: 'Field Metadata Id',
         targetColumnMap: {
@@ -114,15 +114,15 @@ export const seedViewSortFieldMetadata = async (
         icon: null,
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: '' },
+        defaultValue: undefined,
       },
       {
         id: SeedViewSortFieldMetadataIds.View,
         objectMetadataId: SeedObjectMetadataIds.ViewSort,
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'viewId',
         label: 'View Id',
         targetColumnMap: {},

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/view.ts
@@ -124,7 +124,7 @@ export const seedViewFieldMetadata = async (
         isCustom: false,
         workspaceId: SeedWorkspaceId,
         isActive: true,
-        type: FieldMetadataType.TEXT,
+        type: FieldMetadataType.UUID,
         name: 'objectMetadataId',
         label: 'Object Metadata Id',
         targetColumnMap: {
@@ -134,7 +134,7 @@ export const seedViewFieldMetadata = async (
         icon: null,
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: '' },
+        defaultValue: undefined,
       },
       {
         id: SeedViewFieldMetadataIds.Type,
@@ -152,7 +152,7 @@ export const seedViewFieldMetadata = async (
         icon: null,
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: '' },
+        defaultValue: { value: 'table' },
       },
       {
         id: SeedViewFieldMetadataIds.ViewFields,

diff --git a/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts b/server/src/database/typeorm-seeds/metadata/field-metadata/workspace-member.ts
@@ -15,7 +15,6 @@ export enum SeedWorkspaceMemberFieldMetadataIds {
   AvatarUrl = '20202020-7ba6-40d5-934b-17146183a212',
   Locale = '20202020-10f6-4df9-8d6f-a760b65bd800',
   ColorScheme = '20202020-83f2-4c5f-96b0-0c51ecc160e3',
-  AllowImpersonation = '20202020-bb19-44a1-8156-8866f87a5f42',
   UserId = '20202020-f2c1-4ca1-9ca5-7b9d5cc87eb0',
   AuthoredActivities = '20202020-37a0-4db4-9c9f-fd3e3f4e47fc',
   AssignedActivities = '20202020-ac05-44b9-9526-764dd5ce14e2',
@@ -178,7 +177,7 @@ export const seedWorkspaceMemberFieldMetadata = async (
         icon: 'IconColorSwatch',
         isNullable: true,
         isSystem: false,
-        defaultValue: undefined,
+        defaultValue: { value: 'Light' },
       },
       {
         id: SeedWorkspaceMemberFieldMetadataIds.Locale,
@@ -196,7 +195,7 @@ export const seedWorkspaceMemberFieldMetadata = async (
         icon: 'IconLanguage',
         isNullable: false,
         isSystem: false,
-        defaultValue: { value: 'fr' },
+        defaultValue: { value: 'en' },
       },
 
       // Relationships

diff --git a/server/src/database/typeorm-seeds/workspace/workspaceMember.ts b/server/src/database/typeorm-seeds/workspace/workspaceMember.ts
@@ -23,7 +23,6 @@ export const seedWorkspaceMember = async (
       'nameLastName',
       'locale',
       'colorScheme',
-      'allowImpersonation',
       'userId',
     ])
     .orIgnore()
@@ -34,7 +33,6 @@ export const seedWorkspaceMember = async (
         nameLastName: 'Apple',
         locale: 'en',
         colorScheme: 'Light',
-        allowImpersonation: true,
         userId: SeedUserIds.Tim,
       },
       {
@@ -43,7 +41,6 @@ export const seedWorkspaceMember = async (
         nameLastName: 'Ive',
         locale: 'en',
         colorScheme: 'Light',
-        allowImpersonation: true,
         userId: SeedUserIds.Jony,
       },
       {
@@ -52,7 +49,6 @@ export const seedWorkspaceMember = async (
         nameLastName: 'Shiler',
         locale: 'en',
         colorScheme: 'Light',
-        allowImpersonation: true,
         userId: SeedUserIds.Phil,
       },
     ])

diff --git a/...c/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts b/...c/metadata/field-metadata/utils/__tests__/convert-field-metadata-to-column-action.spec.ts
@@ -56,7 +56,7 @@ describe('convertFieldMetadataToColumnActions', () => {
       {
         action: 'CREATE',
         columnName: 'moneyAmountMicros',
-        columnType: 'integer',
+        columnType: 'numeric',
         defaultValue: 100 * 1_000_000,
       },
       {

diff --git a/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts b/server/src/metadata/workspace-migration/migrations/1697618009-addCompanyTable.ts
@@ -22,11 +22,13 @@ export const addCompanyTable: WorkspaceMigrationTableAction[] = [
         columnName: 'domainName',
         columnType: 'varchar',
         action: WorkspaceMigrationColumnActionType.CREATE,
+        defaultValue: "''",
       },
       {
         columnName: 'address',
         columnType: 'varchar',
         action: WorkspaceMigrationColumnActionType.CREATE,
+        defaultValue: "''",
       },
       {
         columnName: 'employees',

diff --git a/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts b/server/src/metadata/workspace-migration/migrations/1697618011-addViewTable.ts
@@ -20,15 +20,14 @@ export const addViewTable: WorkspaceMigrationTableAction[] = [
       },
       {
         columnName: 'objectMetadataId',
-        columnType: 'varchar',
+        columnType: 'uuid',
         action: WorkspaceMigrationColumnActionType.CREATE,
-        defaultValue: "''",
       },
       {
         columnName: 'type',
         columnType: 'varchar',
         action: WorkspaceMigrationColumnActionType.CREATE,
-        defaultValue: "''",
+        defaultValue: "'table'",
       },
     ],
   },

diff --git a/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts b/server/src/metadata/workspace-migration/migrations/1697618012-addViewFieldTable.ts
@@ -14,9 +14,8 @@ export const addViewFieldTable: WorkspaceMigrationTableAction[] = [
     columns: [
       {
         columnName: 'fieldMetadataId',
-        columnType: 'varchar',
+        columnType: 'uuid',
         action: WorkspaceMigrationColumnActionType.CREATE,
-        defaultValue: "''",
       },
       {
         columnName: 'position',

diff --git a/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts b/server/src/metadata/workspace-migration/migrations/1697618013-addViewFilterTable.ts
@@ -14,9 +14,8 @@ export const addViewFilterTable: WorkspaceMigrationTableAction[] = [
     columns: [
       {
         columnName: 'fieldMetadataId',
-        columnType: 'varchar',
+        columnType: 'uuid',
         action: WorkspaceMigrationColumnActionType.CREATE,
-        defaultValue: "''",
       },
       {
         columnName: 'operand',

diff --git a/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts b/server/src/metadata/workspace-migration/migrations/1697618014-addViewSortTable.ts
@@ -14,9 +14,8 @@ export const addViewSortTable: WorkspaceMigrationTableAction[] = [
     columns: [
       {
         columnName: 'fieldMetadataId',
-        columnType: 'varchar',
+        columnType: 'uuid',
         action: WorkspaceMigrationColumnActionType.CREATE,
-        defaultValue: "''",
       },
       {
         columnName: 'direction',