From c22ed0c82e2731c7a01322e394bf4aa8d1e611fd Mon Sep 17 00:00:00 2001
From: Tom Moor <tom.moor@gmail.com>
Date: Sat, 9 Sep 2023 22:39:08 -0400
Subject: [PATCH] BaseModel -> Model

---
 server/models/CollectionGroup.ts              |  4 ++--
 server/models/CollectionUser.ts               |  4 ++--
 server/models/GroupUser.ts                    |  4 ++--
 server/models/base/IdModel.ts                 |  4 ++--
 server/models/base/{BaseModel.ts => Model.ts} | 14 ++++++++++----
 5 files changed, 18 insertions(+), 12 deletions(-)
 rename server/models/base/{BaseModel.ts => Model.ts} (56%)

diff --git a/server/models/CollectionGroup.ts b/server/models/CollectionGroup.ts
index baba676e9..c840da91a 100644
--- a/server/models/CollectionGroup.ts
+++ b/server/models/CollectionGroup.ts
@@ -12,7 +12,7 @@ import { CollectionPermission } from "@shared/types";
 import Collection from "./Collection";
 import Group from "./Group";
 import User from "./User";
-import BaseModel from "./base/BaseModel";
+import Model from "./base/Model";
 import Fix from "./decorators/Fix";
 
 @Scopes(() => ({
@@ -33,7 +33,7 @@ import Fix from "./decorators/Fix";
 }))
 @Table({ tableName: "collection_groups", modelName: "collection_group" })
 @Fix
-class CollectionGroup extends BaseModel {
+class CollectionGroup extends Model {
   @Default(CollectionPermission.ReadWrite)
   @IsIn([Object.values(CollectionPermission)])
   @Column(DataType.STRING)
diff --git a/server/models/CollectionUser.ts b/server/models/CollectionUser.ts
index ad9ae55fc..8bd8e90cd 100644
--- a/server/models/CollectionUser.ts
+++ b/server/models/CollectionUser.ts
@@ -11,7 +11,7 @@ import {
 import { CollectionPermission } from "@shared/types";
 import Collection from "./Collection";
 import User from "./User";
-import BaseModel from "./base/BaseModel";
+import Model from "./base/Model";
 import Fix from "./decorators/Fix";
 
 @Scopes(() => ({
@@ -32,7 +32,7 @@ import Fix from "./decorators/Fix";
 }))
 @Table({ tableName: "collection_users", modelName: "collection_user" })
 @Fix
-class CollectionUser extends BaseModel {
+class CollectionUser extends Model {
   @Default(CollectionPermission.ReadWrite)
   @IsIn([Object.values(CollectionPermission)])
   @Column(DataType.STRING)
diff --git a/server/models/GroupUser.ts b/server/models/GroupUser.ts
index 7a343180b..520b18929 100644
--- a/server/models/GroupUser.ts
+++ b/server/models/GroupUser.ts
@@ -9,7 +9,7 @@ import {
 } from "sequelize-typescript";
 import Group from "./Group";
 import User from "./User";
-import BaseModel from "./base/BaseModel";
+import Model from "./base/Model";
 import Fix from "./decorators/Fix";
 
 @DefaultScope(() => ({
@@ -37,7 +37,7 @@ import Fix from "./decorators/Fix";
 }))
 @Table({ tableName: "group_users", modelName: "group_user", paranoid: true })
 @Fix
-class GroupUser extends BaseModel {
+class GroupUser extends Model {
   @BelongsTo(() => User, "userId")
   user: User;
 
diff --git a/server/models/base/IdModel.ts b/server/models/base/IdModel.ts
index 799760054..5fc2b6468 100644
--- a/server/models/base/IdModel.ts
+++ b/server/models/base/IdModel.ts
@@ -7,9 +7,9 @@ import {
   DataType,
   Default,
 } from "sequelize-typescript";
-import BaseModel from "./BaseModel";
+import Model from "./Model";
 
-class IdModel extends BaseModel {
+class IdModel extends Model {
   @IsUUID(4)
   @PrimaryKey
   @Default(DataType.UUIDV4)
diff --git a/server/models/base/BaseModel.ts b/server/models/base/Model.ts
similarity index 56%
rename from server/models/base/BaseModel.ts
rename to server/models/base/Model.ts
index 0b436536a..52eb415a0 100644
--- a/server/models/base/BaseModel.ts
+++ b/server/models/base/Model.ts
@@ -1,8 +1,14 @@
 import { FindOptions } from "sequelize";
-import { Model } from "sequelize-typescript";
+import { Model as SequelizeModel } from "sequelize-typescript";
 
-class BaseModel extends Model {
-  static async findAllInBatches<T extends BaseModel>(
+class Model extends SequelizeModel {
+  /**
+   * Find all models in batches, calling the callback function for each batch.
+   *
+   * @param query The query options.
+   * @param callback The function to call for each batch of results
+   */
+  static async findAllInBatches<T extends Model>(
     query: FindOptions<T>,
     callback: (results: Array<T>, query: FindOptions<T>) => Promise<void>
   ) {
@@ -23,4 +29,4 @@ class BaseModel extends Model {
   }
 }
 
-export default BaseModel;
+export default Model;