Skip to content

Open-source and local-first Slack and Notion alternative that puts you in control of your data

Refactor some columns

Hakan Shehud63e2ee2d0d2
diff --git a/apps/desktop/src/main/data/app/migrations.ts b/apps/desktop/src/main/data/app/migrations.ts
index ff921f33..a399360c 100644
--- a/apps/desktop/src/main/data/app/migrations.ts
+++ b/apps/desktop/src/main/data/app/migrations.ts
@@ -51,7 +51,6 @@ const createAccountsTable: Migration = {
.addColumn('email', 'text', (col) => col.notNull())
.addColumn('avatar', 'text')
.addColumn('token', 'text', (col) => col.notNull())
- .addColumn('status', 'text', (col) => col.defaultTo('active').notNull())
.execute();
},
down: async (db) => {
diff --git a/apps/desktop/src/main/data/app/schema.ts b/apps/desktop/src/main/data/app/schema.ts
index e8bf1ee6..cfa8341a 100644
--- a/apps/desktop/src/main/data/app/schema.ts
+++ b/apps/desktop/src/main/data/app/schema.ts
@@ -23,7 +23,6 @@ interface AccountTable {
avatar: ColumnType<string | null, string | null, string | null>;
token: ColumnType<string, string, string>;
device_id: ColumnType<string, string, never>;
- status: ColumnType<string, string, string>;
}
export type SelectAccount = Selectable<AccountTable>;
diff --git a/apps/desktop/src/main/data/workspace/migrations.ts b/apps/desktop/src/main/data/workspace/migrations.ts
index 1b131b32..7c6bef6b 100644
--- a/apps/desktop/src/main/data/workspace/migrations.ts
+++ b/apps/desktop/src/main/data/workspace/migrations.ts
@@ -13,7 +13,7 @@ const createUsersTable: Migration = {
.addColumn('role', 'text', (col) => col.notNull())
.addColumn('storage_limit', 'integer', (col) => col.notNull())
.addColumn('max_file_size', 'integer', (col) => col.notNull())
- .addColumn('status', 'text', (col) => col.notNull())
+ .addColumn('status', 'integer', (col) => col.notNull())
.addColumn('created_at', 'text', (col) => col.notNull())
.addColumn('updated_at', 'text')
.addColumn('version', 'integer')
diff --git a/apps/desktop/src/main/data/workspace/schema.ts b/apps/desktop/src/main/data/workspace/schema.ts
index 0fa14c84..574ae6fa 100644
--- a/apps/desktop/src/main/data/workspace/schema.ts
+++ b/apps/desktop/src/main/data/workspace/schema.ts
@@ -6,6 +6,7 @@ import {
WorkspaceRole,
MessageType,
TransactionOperation,
+ UserStatus,
} from '@colanode/core';
import { ColumnType, Insertable, Selectable, Updateable } from 'kysely';
@@ -21,7 +22,7 @@ interface UserTable {
role: ColumnType<WorkspaceRole, WorkspaceRole, WorkspaceRole>;
storage_limit: ColumnType<bigint, bigint, bigint>;
max_file_size: ColumnType<bigint, bigint, bigint>;
- status: ColumnType<string, string, never>;
+ status: ColumnType<UserStatus, UserStatus, UserStatus>;
created_at: ColumnType<string, string, never>;
updated_at: ColumnType<string | null, string | null, string | null>;
version: ColumnType<bigint, bigint, bigint>;
diff --git a/apps/desktop/src/main/mutations/accounts/account-update.ts b/apps/desktop/src/main/mutations/accounts/account-update.ts
index c9740d1f..271ae4b7 100644
--- a/apps/desktop/src/main/mutations/accounts/account-update.ts
+++ b/apps/desktop/src/main/mutations/accounts/account-update.ts
@@ -83,7 +83,6 @@ export class AccountUpdateMutationHandler
avatar: updatedAccount.avatar,
deviceId: updatedAccount.device_id,
server: updatedAccount.server,
- status: updatedAccount.status,
},
});
diff --git a/apps/desktop/src/main/queries/accounts/accounts-list.ts b/apps/desktop/src/main/queries/accounts/accounts-list.ts
index 8eb5353e..38572580 100644
--- a/apps/desktop/src/main/queries/accounts/accounts-list.ts
+++ b/apps/desktop/src/main/queries/accounts/accounts-list.ts
@@ -61,7 +61,6 @@ export class AccountListQueryHandler
return databaseService.appDatabase
.selectFrom('accounts')
.selectAll()
- .where('status', '=', 'active')
.execute();
}
}
diff --git a/apps/desktop/src/main/services/account-service.ts b/apps/desktop/src/main/services/account-service.ts
index b17a8f4d..d62120f6 100644
--- a/apps/desktop/src/main/services/account-service.ts
+++ b/apps/desktop/src/main/services/account-service.ts
@@ -40,7 +40,6 @@ class AccountService {
email: output.account.email,
token: output.token,
server,
- status: 'active',
})
.executeTakeFirst();
diff --git a/apps/desktop/src/main/services/user-service.ts b/apps/desktop/src/main/services/user-service.ts
index 3e785ce6..87e62148 100644
--- a/apps/desktop/src/main/services/user-service.ts
+++ b/apps/desktop/src/main/services/user-service.ts
@@ -1,4 +1,4 @@
-import { SyncUserData } from '@colanode/core';
+import { SyncUserData, UserStatus } from '@colanode/core';
import { mapUser } from '@/main/utils';
import { databaseService } from '@/main/data/database-service';
@@ -23,7 +23,7 @@ class UserService {
version: BigInt(user.version),
created_at: user.createdAt,
updated_at: user.updatedAt,
- status: 'active',
+ status: UserStatus.Active,
custom_name: user.customName,
custom_avatar: user.customAvatar,
})
diff --git a/apps/desktop/src/main/utils.ts b/apps/desktop/src/main/utils.ts
index 5683a066..ed7a60f1 100644
--- a/apps/desktop/src/main/utils.ts
+++ b/apps/desktop/src/main/utils.ts
@@ -234,7 +234,6 @@ export const mapAccount = (row: SelectAccount): Account => {
deviceId: row.device_id,
email: row.email,
token: row.token,
- status: row.status,
};
};
diff --git a/apps/desktop/src/shared/types/accounts.ts b/apps/desktop/src/shared/types/accounts.ts
index 85336f88..1b913a1c 100644
--- a/apps/desktop/src/shared/types/accounts.ts
+++ b/apps/desktop/src/shared/types/accounts.ts
@@ -5,6 +5,5 @@ export type Account = {
avatar?: string | null;
token: string;
deviceId: string;
- status: string;
server: string;
};
diff --git a/apps/server/src/synchronizers/users.ts b/apps/server/src/synchronizers/users.ts
index 342f6c29..7414461c 100644
--- a/apps/server/src/synchronizers/users.ts
+++ b/apps/server/src/synchronizers/users.ts
@@ -70,6 +70,7 @@ export class UserSynchronizer extends BaseSynchronizer<SyncUsersInput> {
createdAt: user.created_at.toISOString(),
updatedAt: user.updated_at?.toISOString() ?? null,
version: user.version.toString(),
+ status: user.status,
}));
return {
diff --git a/packages/core/src/synchronizers/users.ts b/packages/core/src/synchronizers/users.ts
index ad59ece7..47e71adc 100644
--- a/packages/core/src/synchronizers/users.ts
+++ b/packages/core/src/synchronizers/users.ts
@@ -1,4 +1,4 @@
-import { WorkspaceRole } from '../types/workspaces';
+import { UserStatus, WorkspaceRole } from '../types/workspaces';
export type SyncUsersInput = {
type: 'users';
@@ -18,6 +18,7 @@ export type SyncUserData = {
createdAt: string;
updatedAt: string | null;
version: string;
+ status: UserStatus;
};
declare module '@colanode/core' {