Use office relation in presence model

app-nest/package.json

@@ -33,6 +33,7 @@
     "@nestjs/config": "^3.0.0",
     "@nestjs/core": "^10.0.0",
     "@nestjs/platform-express": "^10.0.0",
+    "@nestjs/swagger": "^7.1.8",
     "@nestjs/typeorm": "^10.0.0",
     "@slack/bolt": "^3.13.2",
     "dayjs": "^1.11.9",

app-nest/src/entities/presence/dto/presence.dto.ts

@@ -0,0 +1,8 @@
+import { OmitType, PickType } from "@nestjs/swagger";
+import { Presence } from "../presence.entity";
+
+export class UpsertPresenceDto extends OmitType(Presence, ["office"]) {}
+
+export class SetOfficeDto extends PickType(Presence, ["userId", "date"]) {
+  officeId: number;
+}

app-nest/src/entities/presence/presence.controller.ts

@@ -36,10 +36,10 @@ export class PresenceController {
   async selectOfficeForDate({ ack, body, payload }: BoltActionArgs) {
     await ack();
     const { value, date } = JSON.parse(payload["selected_option"].value);
-    await this.presenceService.upsert({
+    await this.presenceService.setOffice({
       userId: body.user.id,
       date: dayjs(date).toDate(),
-      office: value,
+      officeId: value,
     });
   }
 

app-nest/src/entities/presence/presence.entity.ts

@@ -1,4 +1,5 @@
-import { Column, Entity, PrimaryColumn, Repository } from "typeorm";
+import { Column, Entity, ManyToOne, PrimaryColumn, Repository } from "typeorm";
+import { Office } from "../office/office.entity";
 
 export enum PresenceType {
   AT_OFFICE = "at_office",
@@ -16,8 +17,8 @@ export class Presence {
   @Column({ type: "enum", enum: PresenceType, nullable: true })
   type: PresenceType | null;
 
-  @Column({ nullable: true })
-  office: string | null;
+  @ManyToOne(() => Office, { nullable: true })
+  office: Office;
 }
 
 export type PresenceRepository = Repository<Presence>;

app-nest/src/entities/presence/presence.module.ts

@@ -1,11 +1,12 @@
 import { Module } from "@nestjs/common";
 import { TypeOrmModule } from "@nestjs/typeorm";
+import { OfficeModule } from "../office/office.module";
 import { PresenceController } from "./presence.controller";
 import { Presence } from "./presence.entity";
 import { PresenceService } from "./presence.service";
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Presence])],
+  imports: [TypeOrmModule.forFeature([Presence]), OfficeModule],
   providers: [PresenceService],
   controllers: [PresenceController],
   exports: [TypeOrmModule],

app-nest/src/entities/presence/presence.service.ts

@@ -1,6 +1,7 @@
 import { Injectable } from "@nestjs/common";
 import { InjectRepository } from "@nestjs/typeorm";
 import { DataSource } from "typeorm";
+import { SetOfficeDto, UpsertPresenceDto } from "./dto/presence.dto";
 import { Presence, PresenceRepository } from "./presence.entity";
 
 @Injectable()
@@ -10,14 +11,22 @@ export class PresenceService {
     private dataSource: DataSource,
   ) {}
 
-  async upsert(presence: Partial<Presence>) {
+  async remove(presence: Pick<Presence, "userId" | "date">) {
+    return this.presenceRepository.delete(presence);
+  }
+
+  async upsert(presence: Partial<UpsertPresenceDto>) {
     // 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),
     );
 
+    if (updatableCols.length === 0) {
+      return;
+    }
+
     return this.dataSource
       .createQueryBuilder()
       .insert()
@@ -27,7 +36,14 @@ export class PresenceService {
       .execute();
   }
 
-  async remove(presence: Pick<Presence, "userId" | "date">) {
-    return this.presenceRepository.delete(presence);
+  async setOffice({ userId, date, officeId }: SetOfficeDto) {
+    await this.upsert({ userId, date });
+
+    return this.presenceRepository.update(
+      { userId, date },
+      {
+        office: { id: officeId },
+      },
+    );
   }
 }