MIM-534: Fetch and show malarEnergiFacilityId (#66)

* Update prisma schemas

* Get malarenergi facility id in residence query

* Update generated types

* Show malarenergi facility id

---------

Co-authored-by: Henrik Persson <henrik.persson@iteam.com>

Author: henrikhenrikpersson

packages/property-base/prisma/schema/Residence_balgh.prisma

@@ -38,6 +38,7 @@ model Residence {
 
   residenceType  ResidenceType  @relation(fields: [residenceTypeId], references: [id], onUpdate: NoAction, map: "fkbalghkeybalgt ")
   propertyObject PropertyObject @relation(fields: [propertyObjectId], references: [id], onDelete: Cascade, onUpdate: NoAction, map: "fkbalghkeycmobj")
+  comments       TypeText[]     @relation("ResidenceToTypeText")
   // TODO: Verify relation for checklistId as the InspectionProtocol model was provided but fields need to be verified
   // inspectionProtocol InspectionProtocol? @relation(fields: [checklistId], references: [inspectionProtocolId], onUpdate: NoAction, map: "fkbalghkeylbpro ")
 

packages/property-base/prisma/schema/Template_cmtep.prisma

@@ -0,0 +1,9 @@
+model Template {
+    id      String @id @map("keycmtep") @db.Char(15)
+    type    String @map("keycmtyp") @db.VarChar(10)
+    caption String @map("caption") @db.VarChar(100)
+
+    typeText TypeText[] @relation("TypeTextToTemplate")
+
+    @@map("cmtep")
+}

packages/property-base/prisma/schema/TypeText_cmtex.prisma

@@ -0,0 +1,11 @@
+model TypeText {
+    id       String @id @map("keycmtex") @db.Char(15)
+    keycmtep String @map("keycmtep") @db.Char(15)
+    keycode  String @map("keycode") @db.Char(15)
+    text     String @map("text") @db.VarChar(255)
+
+    template  Template  @relation("TypeTextToTemplate", fields: [keycmtep], references: [id])
+    residence Residence @relation("ResidenceToTypeText", fields: [keycode], references: [id])
+
+    @@map("cmtex")
+}

packages/property-base/src/adapters/residence-adapter.ts

@@ -36,6 +36,17 @@ export type ResidenceWithRelations = Prisma.ResidenceGetPayload<{
         }
       }
     }
+    comments: {
+      where: {
+        template: {
+          type: 'balgh'
+          caption: 'Anläggningsid'
+        }
+      }
+      select: {
+        text: true
+      }
+    }
   }
 }>
 
@@ -72,6 +83,17 @@ export const getResidenceById = async (
             },
           },
         },
+        comments: {
+          where: {
+            template: {
+              type: 'balgh',
+              caption: 'Anläggningsid',
+            },
+          },
+          select: {
+            text: true,
+          },
+        },
       },
     })
     .then(trimStrings)

packages/property-base/src/routes/residences-route.ts

@@ -330,6 +330,7 @@ export const routes = (router: KoaRouter) => {
           code: residence.propertyObject.propertyStructures[0].buildingCode,
           name: residence.propertyObject.propertyStructures[0].buildingName,
         },
+        malarEnergiFacilityId: residence.comments?.[0].text || null,
       } satisfies ResidenceDetails
 
       ctx.status = 200

packages/property-base/src/types/residence.ts

@@ -124,6 +124,7 @@ export const ResidenceDetailedSchema = z.object({
     name: z.string().nullable(),
     code: z.string().nullable(),
   }),
+  malarEnergiFacilityId: z.string().nullable(),
 })
 
 export type ExternalResidence = z.infer<typeof ResidenceSchema>

packages/property-tree/src/components/residence/ResidenceBasicInfo.tsx

@@ -76,8 +76,7 @@ export const ResidenceBasicInfo = ({ residence }: ResidenceBasicInfoProps) => {
                 Anläggnings ID Mälarenergi
               </p>
               <p className="font-medium">
-                {/* {residence.malarenergiFacilityId || '-'} */}
-                N/A
+                {residence.malarEnergiFacilityId || 'N/A'}
               </p>
             </div>
             <div>

packages/property-tree/src/services/api/core/generated/api-types.ts

@@ -1516,6 +1516,84 @@ export interface paths {
       };
     };
   };
+  "/workOrders/xpand/rentalPropertyId/{rentalPropertyId}": {
+    /**
+     * Get work orders by rental property id from xpand
+     * @description Retrieves work orders based on the provided rental property id.
+     */
+    get: {
+      parameters: {
+        path: {
+          /** @description The rental property id used to fetch work orders. */
+          rentalPropertyId: string;
+        };
+      };
+      responses: {
+        /** @description Successfully retrieved work orders. */
+        200: {
+          content: {
+            "application/json": {
+              content?: {
+                totalCount?: number;
+                workOrders?: components["schemas"]["XpandWorkOrder"][];
+              };
+            };
+          };
+        };
+        /** @description Internal server error. Failed to retrieve work orders. */
+        500: {
+          content: {
+            "application/json": {
+              /** @example Internal server error */
+              error?: string;
+            };
+          };
+        };
+      };
+    };
+  };
+  "/workOrders/xpand/{code}": {
+    /**
+     * Get work order details by rental property id from xpand
+     * @description Retrieves work order details.
+     */
+    get: {
+      parameters: {
+        path: {
+          /** @description The work order code to fetch details for. */
+          code: string;
+        };
+      };
+      responses: {
+        /** @description Successfully retrieved work order. */
+        200: {
+          content: {
+            "application/json": {
+              content?: components["schemas"]["XpandWorkOrder"];
+            };
+          };
+        };
+        /** @description Work order not found. */
+        404: {
+          content: {
+            "application/json": {
+              /** @example Work order not found */
+              error?: string;
+            };
+          };
+        };
+        /** @description Internal server error. Failed to retrieve work order. */
+        500: {
+          content: {
+            "application/json": {
+              /** @example Internal server error */
+              error?: string;
+            };
+          };
+        };
+      };
+    };
+  };
   "/workOrders": {
     /**
      * Create a new work order
@@ -2190,7 +2268,6 @@ export interface components {
       Registered: string;
       RentalObjectCode: string;
       Status: string;
-      UseMasterKey: boolean;
       WorkOrderRows: ({
           Description: string | null;
           LocationCode: string | null;
@@ -2206,6 +2283,20 @@ export interface components {
         }[];
       Url?: string;
     };
+    XpandWorkOrder: {
+      AccessCaption: string;
+      Caption: string | null;
+      Code: string;
+      ContactCode: string;
+      Id: string;
+      /** Format: date-time */
+      LastChanged: string;
+      Priority: string | null;
+      /** Format: date-time */
+      Registered: string;
+      RentalObjectCode: string;
+      Status: string;
+    };
     Company: {
       id: string;
       propertyObjectId: string;
@@ -2344,6 +2435,7 @@ export interface components {
         name: string | null;
         code: string | null;
       };
+      malarEnergiFacilityId: string | null;
     };
     Staircase: {
       id: string;

packages/property-tree/src/services/api/generated/api-types.ts

@@ -636,6 +636,7 @@ export interface components {
         name: string | null;
         code: string | null;
       };
+      malarEnergiFacilityId: string | null;
     };
     ResidenceSearchResult: {
       id: string;