fix: employee profile

capsulbrasil · Dec 30, 2024 · f1abf8c · f1abf8c
1 parent 41bc250
commit f1abf8c
Show file tree

Hide file tree

Showing 6 changed files with 51 additions and 16 deletions.
diff --git a/api/.aeria/aeria-sdk.d.ts b/api/.aeria/aeria-sdk.d.ts
@@ -873,6 +873,9 @@ declare type MirrorRouter = {
         "root"
       ]
     }
+  },
+  "/equipmentEmployee/getEquipmentsBorrowedByUser": {
+    "POST": null
   }
 }
 

diff --git a/api/contracts/getEquipmentsBorrowedByUser.ts b/api/contracts/getEquipmentsBorrowedByUser.ts
@@ -0,0 +1,18 @@
+import { defineContract, endpointErrorSchema, HTTPStatus, resultSchema } from "aeria";
+
+export const getEquipmentBorrowedByUserContract = defineContract({
+  response: [
+    endpointErrorSchema({
+      httpStatus: [HTTPStatus.NotFound],
+      code: ["NO_EQUIPMENTS_FOUND"]
+    })
+  ],
+  resultSchema: {
+    type: "object",
+    properties: {
+      equipmentsArray: {
+        $ref: 'asset'
+      }
+    }
+  }
+});
diff --git a/api/src/routes/EquipmentsBorrowoedByUser.ts → api/src/routes/EquipmentsBorrowedByUser.ts b/api/src/routes/EquipmentsBorrowoedByUser.ts → api/src/routes/EquipmentsBorrowedByUser.ts
@@ -2,7 +2,7 @@ import { createRouter, HTTPStatus, Result } from "aeria";
 export const equipmentRouter = createRouter();
 
 equipmentRouter.POST(
-    "/getEquipmentsBorrowoedByUser",
+    "/getEquipmentsBorrowedByUser",
     async (context) => {
         const employeeId = context.token?.sub;
 
@@ -13,18 +13,28 @@ equipmentRouter.POST(
         // Simulação de dados emprestados armazenados na coleção EquipmentRelease
         const borrowedEquipments = await context.collections.equipmentRelease.model.aggregate([
             {
-                $match: { delivered_to: employeeId },
+                $match: {
+                    delivered_to: employeeId
+                }
+            },
+            {
+                $lookup: {
+                    from: 'asset',
+                    localField: 'equipments',
+                    foreignField: '_id',
+                    as: 'equipmentsArray'
+                }
+            },
+            {
+                $unwind: {
+                    path: '$equipmentsArray'
+                }
             },
             {
                 $project: {
-                    equipments: {
-                        $reduce: {
-                            input: "$equipments",
-                            initialValue: [],
-                            in: { $concatArrays: ["$$value", "$$this"] },
-                        },
-                    },
-                },
+                    _id: 0,
+                    equipmentsArray: 1
+                }
             },
         ]).toArray();
 

diff --git a/api/src/routes/index.ts b/api/src/routes/index.ts
@@ -1,6 +1,5 @@
 import { createRouter } from 'aeria'
-import { equipmentRouter } from './EquipmentsBorrowoedByUser.js'
+import { equipmentRouter } from './EquipmentsBorrowedByUser.js'
 
 export const router = createRouter()
-router.group('/getEquipmentsBorrowoedByUser', equipmentRouter)
-
+router.group('/equipmentEmployee', equipmentRouter)
diff --git a/web/.aeria-ui/aeria-sdk.d.ts b/web/.aeria-ui/aeria-sdk.d.ts
@@ -873,6 +873,9 @@ declare type MirrorRouter = {
         "root"
       ]
     }
+  },
+  "/equipmentEmployee/getEquipmentsBorrowedByUser": {
+    "POST": null
   }
 }
 

diff --git a/web/src/pages/dashboard/equipmentRelease-[id].vue b/web/src/pages/dashboard/equipmentRelease-[id].vue
@@ -1,6 +1,7 @@
 <script setup lang="ts">
 import { type CollectionItemWithId } from '@aeriajs/types';
 import { ref, onMounted } from 'vue';
+import EquipmentRelease from './equipmentRelease.vue';
 
 
 definePage({
@@ -13,7 +14,7 @@ const employeeProps = defineProps<Props>()
 const employee = ref({} as CollectionItemWithId<'employee'>)
 const equipments = ref<CollectionItemWithId<'equipmentRelease'>[]>([])
 
-const { error, result } = await aeria().equipmentRelease.
+const { error, result } = await aeria().equipmentEmployee.getEquipmentsBorrowedByUser.POST()
 
 type Props = {
     id: String
@@ -38,6 +39,8 @@ onMounted(async () => {
     if (equipmentReleaseError) {
         return;
     }
+    EquipmentRelease.value = equipmentReleaseResult;
+
 });
 
 </script>
@@ -99,8 +102,7 @@ onMounted(async () => {
                         </tr>
                     </thead>
                     <tbody>
-                        <tr v-for="equipment in equipments" :key="equipment._id"
-                            class="tw-border-b tw-border-gray-700">
+                        <tr v-for="equipment in equipments" :key="equipment._id" class="tw-border-b tw-border-gray-700">
                             <td class="tw-py-2 tw-px-4">{{ equipment.name }}</td>
                             <td class="tw-py-2 tw-px-4">{{ equipment.code }}</td>
                             <td class="tw-py-2 tw-px-4">{{ formatDateTime(equipment.allocation_date) }}</td>
-Original file line number
+Diff line change
@@ Expand Up / @@ -873,6 +873,9 @@ declare type MirrorRouter = { @@
             "root"
           ]
         }
+      },
+      "/equipmentEmployee/getEquipmentsBorrowedByUser": {
+        "POST": null
       }
     }
@@ Expand Down @@