Merge pull request #261 from CampusDual/BFS42024-325

BFS42024-325
CampusDual · Jan 15, 2025 · a9b6303 · a9b6303
2 parents a28c2c1 + 5808be7
commit a9b6303
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 3 deletions.
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/en.json
@@ -385,11 +385,11 @@
   "festivos":"Holidays",
   "holiday_date":"Holiday date",
   "REQ_LHOLIDAY_DATE":"Holiday date*",
-  "students_summary": "Students",
   "AsignarBoot" : "Assign bootcamps",
   "StudentLaboralStat" : "Student laboral status",
   "NewNote" : "New note",
   "Note" : "Note",
   "Session" : "Session",
-  "AcaData" : "Academic data"
+  "AcaData" : "Academic data",
+  "NOT_DELETABLE_TUTOR_TYPE_IS_DEFAULT": "The default mentor type cannot be deleted"
 }
diff --git a/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json b/cd2024bfs4g1-frontend/src/main/ngx/src/assets/i18n/es.json
@@ -388,6 +388,7 @@
   "LHOLIDAYS":"Gestión de festivos",
   "festivos":"Holidays",
   "holiday_date":"Fecha del festivo",
-  "REQ_LHOLIDAY_DATE":"Fecha del festivo*"
+  "REQ_LHOLIDAY_DATE":"Fecha del festivo*",
+  "NOT_DELETABLE_TUTOR_TYPE_IS_DEFAULT": "El tipo de tutor que quieres eliminar es el por defecto"
 
 }
diff --git a/...-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/TutorTypeService.java b/...-model/src/main/java/com/campusdual/cd2024bfs4g1/model/core/service/TutorTypeService.java
@@ -63,6 +63,13 @@ public EntityResult tutorTypeUpdate(Map<String, Object> attrMap, Map<String, Obj
     @Override
     public EntityResult tutorTypeDelete(Map<String, Object> keyMap) throws OntimizeJEERuntimeException {
        try {
+           Integer id = (Integer) keyMap.get("id");
+           if (id <= 2){
+               EntityResult error = new EntityResultMapImpl();
+               error.setMessage("NOT_DELETABLE_TUTOR_TYPE_IS_DEFAULT");
+               error.setCode(EntityResult.OPERATION_WRONG);
+               return error;
+           }
            return this.daoHelper.delete(this.tutorTypeDao, keyMap);
        } catch (DataIntegrityViolationException e) {
            EntityResult error = new EntityResultMapImpl();

diff --git a/cd2024bfs4g1-model/src/main/resources/db/migration/V46__repare_tutors_type.sql b/cd2024bfs4g1-model/src/main/resources/db/migration/V46__repare_tutors_type.sql
@@ -0,0 +1,8 @@
+
+DELETE FROM public.tutors_type WHERE id IN (1,2);
+
+INSERT INTO public.tutors_type (id, "type") VALUES(1, 'Titular');
+INSERT INTO public.tutors_type (id, "type") VALUES(2, 'Apoyo');
+
+ALTER TABLE tutor_bootcamp
+    ADD CONSTRAINT fk_tutor_type_bootcamp FOREIGN KEY (tutor_type) REFERENCES tutors_type(id);