Replace presence type with remote column

funidata · Dec 31, 2024 · 6b4f343 · 6b4f343
1 parent 67daa8d
commit 6b4f343
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 4 deletions.
diff --git a/app/src/database/migrations/1735633836694-replace-presence-type-with-remote-column.ts b/app/src/database/migrations/1735633836694-replace-presence-type-with-remote-column.ts
@@ -0,0 +1,16 @@
+import { MigrationInterface, QueryRunner, TableColumn } from "typeorm";
+
+export class ReplacePresenceTypeWithRemoteColumn1735633836694 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    const table = await queryRunner.getTable("presence");
+
+    await queryRunner.dropColumn(table, "type");
+
+    await queryRunner.addColumn(
+      table,
+      new TableColumn({ name: "remote", type: "boolean", isNullable: false, default: false }),
+    );
+  }
+
+  public async down(): Promise<void> {}
+}
diff --git a/app/src/entities/presence/presence.model.ts b/app/src/entities/presence/presence.model.ts
@@ -2,6 +2,7 @@ import { Column, Entity, JoinColumn, ManyToOne, PrimaryColumn, Repository } from
 import { Office } from "../office/office.model";
 import { User } from "../user/user.model";
 
+// TODO: Remove.
 export enum PresenceType {
   OFFICE = "office",
   REMOTE = "remote",
@@ -20,8 +21,8 @@ export class Presence {
   @PrimaryColumn({ type: "date" })
   date: string;
 
-  @Column({ type: "enum", enum: PresenceType, nullable: true })
-  type: PresenceType | null;
+  @Column({ name: "remote", type: "boolean", nullable: false, default: false })
+  remote: boolean;
 
   @ManyToOne(() => Office, { nullable: true, eager: true })
   @JoinColumn({ name: "office_id" })

diff --git a/app/src/gui/home-tab/views/registration/day-list-item.ts b/app/src/gui/home-tab/views/registration/day-list-item.ts
@@ -28,12 +28,12 @@ export class DayListItem {
           text: "Toimistolla",
           actionId: Action.SET_OFFICE_PRESENCE,
           value: dateString,
-        }).primary(currentPresence?.type === "office"),
+        }).primary(currentPresence?.remote === false),
         Button({
           text: "Etänä",
           actionId: Action.SET_REMOTE_PRESENCE,
           value: dateString,
-        }).primary(currentPresence?.type === "remote"),
+        }).primary(currentPresence?.remote === true),
         this.getOfficeBlocks(props),
         OverflowMenu({ actionId: Action.DAY_LIST_ITEM_OVERFLOW }).options(
           Option({