many corrections after user feedbacks

lucasgehl3n · Nov 19, 2023 · 25b6283 · 25b6283
1 parent b673d75
commit 25b6283
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 2 deletions.
diff --git a/src/controllers/InstitutionController.ts b/src/controllers/InstitutionController.ts
@@ -11,6 +11,7 @@ import { Roles } from "../enums/Roles";
 import UserRole from "../database/models/UserRole";
 import InstitutionFilters from "../filters/InstitutionFilters";
 import { Op } from "sequelize";
+import User from "../database/models/User";
 
 const _mapGalleryToData = (req: Request, images: Record<string, any>) => {
     const publicImages = images.filter(
@@ -161,6 +162,11 @@ class InstitutionController {
                 include: [
                     'address',
                     'publicImages',
+                    {
+                        model: User,
+                        as: 'userCreator',
+                        attributes: ['name'],
+                    },
                 ],
                 attributes: {
                     exclude: [

diff --git a/src/database/models/Animal.ts b/src/database/models/Animal.ts
@@ -80,7 +80,7 @@ Animal.init(
             allowNull: true,
         },
         weight: {
-            type: DataTypes.INTEGER,
+            type: DataTypes.FLOAT,
             allowNull: true,
         },
         deathDate: {

diff --git a/src/services/AnimalPredictionService.ts b/src/services/AnimalPredictionService.ts
@@ -4,7 +4,6 @@ import Animal from "../database/models/Animal";
 import AnimalPrediction from "../database/models/AnimalPrediction";
 import AnimalPredictionView from "../views/AnimalPredictionView";
 import AnimalView from "../views/AnimalView";
-import AnimalService from "./AnimalService";
 import BaseService from "./BaseService";
 import BreedService from "./BreedService";
 class AnimalPredictionService extends BaseService<AnimalPrediction>{