First step for typeorm upgrade!

Task: https://rootspace.app/taskboard/6/item/1567/type-orm-and-nested-set-tree-issue Remaining issues: Now, the typeorm-seeding is not compatible with newer version of typeorm so we have to make upgrade of seeders. I was not able to find dropin replacement. more: w3tecch/typeorm-seeding#228
nardev · Apr 25, 2023 · ac616b4 · ac616b4
1 parent bbcc0f5
commit ac616b4
Show file tree

Hide file tree

Showing 25 changed files with 240 additions and 254 deletions.
diff --git a/api/package.json b/api/package.json
@@ -76,7 +76,7 @@
     "reflect-metadata": "^0.1.13",
     "sharp": "^0.25.4",
     "socket.io": "^3.0.1",
-    "typeorm": "0.2.25",
+    "typeorm": "0.3.12",
     "typeorm-seeding": "^1.6.1",
     "uuid": "^8.3.0",
     "ws": "^7.4.0",

diff --git a/api/src/commands/spaces/DeleteCommand.ts b/api/src/commands/spaces/DeleteCommand.ts
@@ -36,7 +36,7 @@ export class DeleteCommand {
 
   private static async deleteSpace(id: number) {
     const spaceRepository = getCustomRepository(SpaceRepository)
-    const space = await spaceRepository.findOne(id)
+    const space = await spaceRepository.findOne({where: {id}})
 
     if (space) {
       // tslint:disable-next-line:no-console
@@ -54,7 +54,7 @@ export class DeleteCommand {
 
     // Docs
     const docsRepository = getCustomRepository(DocRepository)
-    const docs = await docsRepository.find({spaceId: id})
+    const docs = await docsRepository.find({where: {spaceId: id}})
     if (docs) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting docs ...`))
@@ -64,7 +64,7 @@ export class DeleteCommand {
 
     // Docs Revisions
     const docsRevisionsRepository = getCustomRepository(DocRevisionRepository)
-    const docsRevisions = await docsRevisionsRepository.find({spaceId: id})
+    const docsRevisions = await docsRevisionsRepository.find({where: {spaceId: id}})
     if (docsRevisions) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting doc revisions ...`))
@@ -74,7 +74,7 @@ export class DeleteCommand {
 
     // Embeds
     const embedsRepository = getCustomRepository(EmbedRepository)
-    const embeds = await embedsRepository.find({spaceId: id})
+    const embeds = await embedsRepository.find({where: {spaceId: id}})
     if (embeds) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting embeds ...`))
@@ -84,7 +84,7 @@ export class DeleteCommand {
 
     // Favorites
     const favoritesRepository = getCustomRepository(FavoriteRepository)
-    const favorites = await favoritesRepository.find({spaceId: id})
+    const favorites = await favoritesRepository.find({where: {spaceId: id}})
     if (favorites) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting favorites ...`))
@@ -94,7 +94,7 @@ export class DeleteCommand {
 
     // Folders
     const foldersRepository = getCustomRepository(FolderRepository)
-    const folders = await foldersRepository.find({spaceId: id})
+    const folders = await foldersRepository.find({where: {spaceId: id}})
     if (folders) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting folders ...`))
@@ -107,7 +107,7 @@ export class DeleteCommand {
 
     // Invites
     const invitesRepository = getCustomRepository(InviteRepository)
-    const invites = await invitesRepository.find({spaceId: id})
+    const invites = await invitesRepository.find({where: {spaceId: id}})
     if (invites) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting invites ...`))
@@ -117,7 +117,7 @@ export class DeleteCommand {
 
     // Links
     const linksRepository = getCustomRepository(LinkRepository)
-    const links = await linksRepository.find({spaceId: id})
+    const links = await linksRepository.find({where: {spaceId: id}})
     if (links) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting links ...`))
@@ -127,7 +127,7 @@ export class DeleteCommand {
 
     // Nodes
     const nodesRepository = getCustomRepository(NodeRepository)
-    const nodes = await nodesRepository.find({spaceId: id})
+    const nodes = await nodesRepository.find({where: {spaceId: id}})
     if (nodes) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting nodes ...`))
@@ -137,7 +137,7 @@ export class DeleteCommand {
 
     // Notifications
     const notificationsRepository = getCustomRepository(NotificationRepository)
-    const notifications = await notificationsRepository.find({spaceId: id})
+    const notifications = await notificationsRepository.find({where: {spaceId: id}})
     if (notifications) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting notifications ...`))
@@ -148,7 +148,7 @@ export class DeleteCommand {
     // Uploads
     // Todo: Delete files from remote storage
     const uploadsRepository = getCustomRepository(UploadRepository)
-    const uploads = await uploadsRepository.find({spaceId: id})
+    const uploads = await uploadsRepository.find({where: {spaceId: id}})
     if (uploads) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting uploads ...`))
@@ -158,7 +158,7 @@ export class DeleteCommand {
 
     // User Settings
     const userSettingsRepository = getCustomRepository(UserSettingRepository)
-    const settings = await userSettingsRepository.find({spaceId: id})
+    const settings = await userSettingsRepository.find({where: {spaceId: id}})
     if (settings) {
       // tslint:disable-next-line:no-console
       console.log(chalk.yellow(`Deleting user settings ...`))

diff --git a/api/src/commands/tasks/OverdueCommand.ts b/api/src/commands/tasks/OverdueCommand.ts
@@ -24,14 +24,14 @@ export class OverdueCommand {
   private static async updateTasks() {
     // tslint:disable-next-line:no-console
     console.log(chalk.yellow('Updating isOverdue...'))
-    const yesterday = moment().subtract(1, 'days')
+    const yesterday = moment().subtract(1, 'days').toDate()
 
     const repository = getCustomRepository(TaskRepository)
-    const tasks = await repository.find(
-      {
+    const tasks = await repository.find({
+      where: {
         isOverdue: false,
         dueDate: LessThan(yesterday)
-      })
+      }})
 
     for (const task of tasks) {
       task.isOverdue = OverdueCommand.isOverdue(task)

diff --git a/api/src/database/commands/tasks/BoardIdCommand.ts b/api/src/database/commands/tasks/BoardIdCommand.ts
@@ -30,7 +30,7 @@ export class BoardIdCommand {
       .getMany()
 
     for (const task of tasks) {
-      const taskList = await getCustomRepository(TaskListRepository).findOne(task.listId)
+      const taskList = await getCustomRepository(TaskListRepository).findOne({where: {id: task.listId}})
 
       task.boardId = taskList.boardId
     }

diff --git a/api/src/database/entities/UserToSpace.ts b/api/src/database/entities/UserToSpace.ts
@@ -1,4 +1,4 @@
-import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, Index, CreateDateColumn, UpdateDateColumn } from 'typeorm'
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne, Index, CreateDateColumn, UpdateDateColumn, JoinColumn } from 'typeorm'
 import { User } from './User'
 import { Space } from './Space'
 
@@ -29,15 +29,15 @@ export class UserToSpace {
 
   @ManyToOne(
     (type) => User,
-    (user) => user.userSpaces,
-    { primary: true }
+    (user) => user.userSpaces
   )
+  @JoinColumn({ name: 'userId' })
   user: User
 
   @ManyToOne(
     (type) => Space,
-    (space) => space.userSpaces,
-    { primary: true }
+    (space) => space.userSpaces
   )
+  @JoinColumn({ name: 'spaceId' })
   space: Space
 }
diff --git a/api/src/database/repositories/BaseRepository.ts b/api/src/database/repositories/BaseRepository.ts
@@ -1,9 +1,9 @@
-import { Repository } from 'typeorm'
+import { FindOptionsWhere, Repository } from 'typeorm'
 
 interface WithId { id: number }
 
-export abstract class BaseRepository<T> extends Repository<T> {
-    public reload<ET extends WithId>(entity: ET): Promise<ET> {
-        return this.findOneOrFail(entity.id) as any
+export abstract class BaseRepository<T extends WithId> extends Repository<T> {
+    public reload(entity: T): Promise<T> {
+        return this.findOneByOrFail({id:entity.id} as FindOptionsWhere<T>) as any
     }
 }
diff --git a/api/src/database/seeder/dev/Seeder.ts b/api/src/database/seeder/dev/Seeder.ts
@@ -15,7 +15,7 @@ export class DevSeeder implements Seeder {
 
   public async run(factory: Factory, connection: Connection): Promise<any> {
     this.factory = factory
-    const userCount = await connection.manager.count(User, {email: this.demoUserData.email})
+    const userCount = await connection.manager.count(User, {where:{ email: this.demoUserData.email}})
     if (userCount===0){
       await this.createUser()
     }

diff --git a/api/src/libs/cron/MarkOverdueTasks.ts b/api/src/libs/cron/MarkOverdueTasks.ts
@@ -5,12 +5,12 @@ import moment from 'moment'
 
 export class MarkOverdueTasks {
   static async run() {
-    const yesterday = moment().subtract(1, 'days')
-    const tasks = await getCustomRepository(TaskRepository).find(
-      {
+    const yesterday = moment().subtract(1, 'days').toDate();
+    const tasks = await getCustomRepository(TaskRepository).find({
+      where: {
         isOverdue: false,
         dueDate: LessThan(yesterday)
-      }
+      }}
     )
 
     for (const task of tasks) {

diff --git a/api/src/services/FollowService.ts b/api/src/services/FollowService.ts
@@ -27,14 +27,14 @@ export class FollowService {
   }
 
   async getById(id: number): Promise<Follow> {
-    return this.getFollowRepository().findOneOrFail(id)
+    return this.getFollowRepository().findOneOrFail({where: {id}})
   }
 
   async getFollowsForActivity(activity: Activity): Promise<Follow[]> {
-    const follows = await this.getFollowRepository().find({
+    const follows = await this.getFollowRepository().find({where:{
       entityId: activity.entityId,
       entity: activity.entity,
-    })
+    }})
 
     return follows.filter((follow) => {
       return follow.userId !== activity.actorId
@@ -50,31 +50,31 @@ export class FollowService {
   }
 
   async followFromRequest(userId: number, entity: any): Promise<Follow> {
-    const user = await this.userService.getUserRepository().findOneOrFail(userId)
+    const user = await this.userService.getUserRepository().findOneOrFail({where: {id: userId}})
     return this.follow(user, entity)
   }
 
   async unfollowFromRequest(userId: number, entity: any): Promise<Follow> {
-    const user = await this.userService.getUserRepository().findOneOrFail(userId)
+    const user = await this.userService.getUserRepository().findOneOrFail({where: {id: userId}})
     return this.unfollow(user, entity)
   }
 
   async followEntity(userId: number, entity: any): Promise<Follow> {
-    const user = await this.userService.getUserRepository().findOneOrFail(userId)
+    const user = await this.userService.getUserRepository().findOneOrFail({where: {id: userId}})
     return this.follow(user, entity)
   }
 
   async unfollowEntity(userId: number, entity: any): Promise<Follow> {
-    const user = await this.userService.getUserRepository().findOneOrFail(userId)
+    const user = await this.userService.getUserRepository().findOneOrFail({where: {id: userId}})
     return this.unfollow(user, entity)
   }
 
   async follow(user: User, entity: any): Promise<Follow> {
-    const follow = await this.getFollowRepository().findOne({
+    const follow = await this.getFollowRepository().findOne({where: {
       userId: user.id,
       entityId: entity.id,
       entity: entity.constructor.name,
-    })
+    }})
 
     if (follow) {
       return follow
@@ -91,11 +91,11 @@ export class FollowService {
   }
 
   async unfollow(user: User, entity: any): Promise<Follow> {
-    const follow = await this.getFollowRepository().findOne({
+    const follow = await this.getFollowRepository().findOne({where: {
       userId: user.id,
       entityId: entity.id,
       entity: entity.constructor.name,
-    })
+    }})
 
     if (!follow) {
       return

diff --git a/api/src/services/NotificationService.ts b/api/src/services/NotificationService.ts
@@ -30,7 +30,7 @@ export class NotificationService {
       throw clientError('Notification not found', HttpErrName.EntityNotFound, HttpStatusCode.NotFound)
     }
 
-    return this.getNotificationRepository().findOne(id)
+    return this.getNotificationRepository().findOne({where: {id}})
   }
 
   async create(activity: Activity, userId: number): Promise<Notification> {

diff --git a/api/src/services/activity/ActivityService.ts b/api/src/services/activity/ActivityService.ts
@@ -50,7 +50,7 @@ export class ActivityService implements IActivityObserver {
   }
 
   getById(id: number): Promise<Activity | undefined> {
-    return this.getActivityRepository().findOne(id)
+    return this.getActivityRepository().findOne({where: {id}})
   }
 
   async getBySpaceId(spaceId: number, filter: any = {}, options: any = {}): Promise<Activity[]> {

diff --git a/api/src/services/content-access/ContentAccessService.ts b/api/src/services/content-access/ContentAccessService.ts
@@ -37,7 +37,7 @@ export class ContentAccessService extends Service {
   }
 
   getById(id: number): Promise<ContentAccess> {
-    return this.getRepository().findOne(id)
+    return this.getRepository().findOne({where: {id}})
   }
 
   async requireById(id: number): Promise<ContentAccess> {

diff --git a/api/src/services/content/FavoriteService.ts b/api/src/services/content/FavoriteService.ts
@@ -21,7 +21,7 @@ export class FavoriteService {
   }
 
   getById(id: number): Promise<Favorite | undefined> {
-    return this.getFavoriteRepository().findOne(id)
+    return this.getFavoriteRepository().findOne({where: {id}})
   }
 
   async requireById(id: number): Promise<Favorite> {

diff --git a/api/src/services/content/doc/DocService.ts b/api/src/services/content/doc/DocService.ts
@@ -61,7 +61,7 @@ export class DocService extends NodeContentService {
   }
 
   getDocRevisionById(id: number): Promise<DocRevision | undefined> {
-    return this.getDocRevisionRepository().findOne(id)
+    return this.getDocRevisionRepository().findOne({where: {id}})
   }
 
   async requireDocRevisionById(id: number): Promise<DocRevision> {

diff --git a/api/src/services/content/tasks/TaskBoardService.ts b/api/src/services/content/tasks/TaskBoardService.ts
@@ -101,7 +101,7 @@ export class TaskBoardService extends NodeContentService {
   }
 
   async save(data: any, parentId?: number): Promise<TaskBoard & Node> {
-    data.space = await this.getSpaceRepository().findOneOrFail(data.spaceId)
+    data.space = await this.getSpaceRepository().findOneOrFail({where: {id: data.spaceId}})
     let taskBoard = await this.getTaskBoardRepository().save(data)
 
     let value = NodeCreateValue.fromObject({

diff --git a/api/src/services/content/tasks/TaskBoardTagService.ts b/api/src/services/content/tasks/TaskBoardTagService.ts
@@ -18,11 +18,11 @@ export class TaskBoardTagService {
   }
 
   async getById(id: number): Promise<Tag> {
-    return this.getTagRepository().findOneOrFail(id)
+    return this.getTagRepository().findOneOrFail({where: {id}})
   }
 
   async getByTaskBoardId(id: number): Promise<Tag[]> {
-    return this.getTagRepository().find({ boardId: id })
+    return this.getTagRepository().find({where: { boardId: id }})
   }
 
   async create(data: any): Promise<Tag> {

diff --git a/api/src/services/content/tasks/TaskCommentService.ts b/api/src/services/content/tasks/TaskCommentService.ts
@@ -29,7 +29,7 @@ export class TaskCommentService extends Service {
   }
 
   async getById(id: number): Promise<TaskComment> {
-    return this.getTaskCommentRepository().findOneOrFail(id)
+    return this.getTaskCommentRepository().findOneOrFail({where: {id}})
   }
 
   async create(data: any): Promise<TaskComment> {

diff --git a/api/src/services/content/tasks/TaskListService.ts b/api/src/services/content/tasks/TaskListService.ts
@@ -40,7 +40,7 @@ export class TaskListService extends Service {
   }
 
   async getById(id: number): Promise<TaskList | undefined> {
-    return this.getTaskListRepository().findOne(id)
+    return this.getTaskListRepository().findOne({where: {id}})
   }
 
   async requireById(id: number): Promise<TaskList> {
@@ -71,8 +71,8 @@ export class TaskListService extends Service {
   }
 
   async create(data: any): Promise<TaskList> {
-    data.space = await this.getSpaceRepository().findOneOrFail(data.spaceId)
-    data.board = await this.getTaskBoardRepository().findOneOrFail(data.boardId)
+    data.space = await this.getSpaceRepository().findOneOrFail({where: {id: data.spaceId}})
+    data.board = await this.getTaskBoardRepository().findOneOrFail({where: {id: data.boardId}})
 
     const taskList = await this.getTaskListRepository().save(data)
     await this.notifyActivity(TaskListActivity.created(taskList, taskList.userId))