Select office by day through UI

funidata · Aug 9, 2023 · 5c7d0dc · 5c7d0dc
1 parent 45801f4
commit 5c7d0dc
Show file tree

Hide file tree

Showing 5 changed files with 30 additions and 8 deletions.
diff --git a/app-nest/src/bolt/enums/bolt-actions.enum.ts b/app-nest/src/bolt/enums/bolt-actions.enum.ts
@@ -1,6 +1,7 @@
 enum BoltActions {
   SYNC_USERS = "sync_users",
   REGISTER_PRESENCE = "register_presence",
+  SELECT_OFFICE_FOR_DATE = "select_office_for_date",
 }
 
 export default BoltActions;
diff --git a/app-nest/src/entities/presence/presence.controller.ts b/app-nest/src/entities/presence/presence.controller.ts
@@ -20,4 +20,15 @@ export class PresenceController {
       date,
     });
   }
+
+  @BoltAction(BoltActions.SELECT_OFFICE_FOR_DATE)
+  async selectOfficeForDate({ ack, body, payload }: BoltActionArgs) {
+    await ack();
+    const { value, date } = JSON.parse(payload["selected_option"].value);
+    await this.presenceService.upsert({
+      userId: body.user.id,
+      date: dayjs(date).toDate(),
+      office: value,
+    });
+  }
 }
diff --git a/app-nest/src/entities/presence/presence.entity.ts b/app-nest/src/entities/presence/presence.entity.ts
@@ -13,8 +13,11 @@ export class Presence {
   @PrimaryColumn({ type: "date" })
   date: Date;
 
-  @Column({ type: "enum", enum: PresenceType })
-  type: PresenceType;
+  @Column({ type: "enum", enum: PresenceType, nullable: true })
+  type: PresenceType | null;
+
+  @Column({ nullable: true })
+  office: string | null;
 }
 
 export type PresenceRepository = Repository<Presence>;
diff --git a/app-nest/src/entities/presence/presence.service.ts b/app-nest/src/entities/presence/presence.service.ts
@@ -10,13 +10,20 @@ export class PresenceService {
     private dataSource: DataSource,
   ) {}
 
-  async upsert(presence: Presence) {
+  async upsert(presence: Partial<Presence>) {
+    // Select only existing cols for the upsert operation to avoid overriding
+    // existing data with defaults/nulls.
+    const primaryKeys = ["userId", "date"];
+    const updatableCols = Object.keys(presence).filter(
+      (key) => !primaryKeys.includes(key),
+    );
+
     return this.dataSource
       .createQueryBuilder()
       .insert()
       .into(Presence)
       .values(presence)
-      .orUpdate(["type"], ["userId", "date"])
+      .orUpdate(updatableCols, primaryKeys)
       .execute();
   }
 }
diff --git a/app-nest/src/gui/tabs/home/day-list-item.blocks.ts b/app-nest/src/gui/tabs/home/day-list-item.blocks.ts
@@ -34,7 +34,7 @@ const getDayListItemBlocks = ({ date }: DayListItemProps) => [
         },
       },
       {
-        action_id: "text1234",
+        action_id: BoltActions.SELECT_OFFICE_FOR_DATE,
         type: "static_select",
         placeholder: {
           type: "plain_text",
@@ -45,22 +45,22 @@ const getDayListItemBlocks = ({ date }: DayListItemProps) => [
             type: "plain_text",
             text: "Helsinki",
           },
-          value: "hki",
+          value: JSON.stringify({ value: "hki", date: date.toISOString() }),
         },
         options: [
           {
             text: {
               type: "plain_text",
               text: "Helsinki",
             },
-            value: "hki",
+            value: JSON.stringify({ value: "hki", date: date.toISOString() }),
           },
           {
             text: {
               type: "plain_text",
               text: "Tampere",
             },
-            value: "tre",
+            value: JSON.stringify({ value: "tre", date: date.toISOString() }),
           },
         ],
       },