10 fix/microservicio clases

pom.xml

@@ -13,8 +13,8 @@
     <groupId>com.members</groupId>
     <artifactId>msvc-members</artifactId>
     <version>0.0.1-SNAPSHOT</version>
-    <name>msvc-members</name>
-    <description>msvc-members</description>
+    <name>msvc-classes</name>
+    <description>msvc-classes</description>
     <url/>
     <licenses>
         <license/>
@@ -122,11 +122,6 @@
             <version>1.5.5.Final</version>
             <scope>provided</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springdoc</groupId>
-            <artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
-            <version>2.8.11</version>
-        </dependency>
         <dependency>
             <groupId>com.cloudinary</groupId>
             <artifactId>cloudinary-http44</artifactId>

src/main/java/com/classes/controllers/ClassController.java

@@ -1,7 +1,9 @@
 package com.classes.controllers;
 
-import com.classes.dtos.ClassDTO;
+import com.classes.dtos.Class.ClassRequest;
+import com.classes.dtos.Class.ClassResponse;
 import com.classes.services.ClassService;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.PostMapping;
 import lombok.RequiredArgsConstructor;
 import org.springframework.http.HttpStatus;
@@ -19,25 +21,31 @@ public class ClassController {
     private final ClassService classService;
 
 
+
     @PostMapping
-    public ResponseEntity<ClassDTO> createClass(@RequestBody ClassDTO dto) {
-        ClassDTO created = classService.createClass(dto);
-        return new ResponseEntity<>(created, HttpStatus.CREATED);
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id, authentication)")
+    public ResponseEntity<ClassResponse> createClass(@RequestBody ClassRequest request) {
+        ClassResponse created = classService.createClass(request);
+        return ResponseEntity.status(HttpStatus.CREATED).body(created);
     }
 
     @GetMapping
-    public ResponseEntity<List<ClassDTO>> findAllClasses() {
-        List<ClassDTO> list = classService.findAll();
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id, authentication)")
+    public ResponseEntity<List<ClassResponse>> findAllClasses() {
+        List<ClassResponse> list = classService.findAll();
         return ResponseEntity.ok(list);
     }
 
+
     @PutMapping("/{id}")
-    public ResponseEntity<ClassDTO> updateClass(@PathVariable UUID id, @RequestBody ClassDTO dto) {
-        ClassDTO updated = classService.updateClass(id, dto);
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id, authentication)")
+    public ResponseEntity<ClassResponse> updateClass(@PathVariable UUID id, @RequestBody ClassRequest request) {
+        ClassResponse updated = classService.updateClass(id, request);
         return ResponseEntity.ok(updated);
     }
 
     @DeleteMapping("/{id}")
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id, authentication)")
     public ResponseEntity<String> deleteClass(@PathVariable UUID id) {
         classService.deleteClass(id);
         return ResponseEntity.ok("Clase eliminada correctamente");

src/main/java/com/classes/controllers/LocationController.java

@@ -1,16 +1,16 @@
 package com.classes.controllers;
 
 import com.classes.annotations.AdminOrTrainerAccess;
-import com.classes.dtos.LocationDTO;
-import com.classes.entities.LocationEntity;
+import com.classes.dtos.Location.LocationRequest;
+import com.classes.dtos.Location.LocationResponse;
 import com.classes.services.LocationService;
 import lombok.RequiredArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.web.bind.annotation.*;
 
-import java.util.List;
 import java.util.UUID;
 
 @RestController
@@ -21,29 +21,45 @@ public class LocationController {
 
     private final LocationService locationService;
 
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @PostMapping
-    public ResponseEntity<LocationDTO> create(@RequestBody LocationDTO dto) {
-        LocationDTO created = locationService.create(dto);
+    public ResponseEntity<LocationResponse> create(@RequestBody LocationRequest request) {
+        LocationResponse created = locationService.create(request);
         return new ResponseEntity<>(created, HttpStatus.CREATED);
     }
 
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @GetMapping
-    public ResponseEntity<Page<LocationDTO>> findAll(
+    public ResponseEntity<Page<LocationResponse>> findAll(
             @RequestParam(defaultValue = "0") int page,
-            @RequestParam(defaultValue = "10") int size
+            @RequestParam(defaultValue = "10") int size,
+            @RequestParam(required = false) String search,
+            @RequestParam(required = false) Boolean active
     ) {
-        Page<LocationDTO> locations = locationService.findAll(page, size);
+        Page<LocationResponse> locations = locationService.findAll(page, size, search, active);
         return ResponseEntity.ok(locations);
     }
-
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @GetMapping("/{id}")
-    public ResponseEntity<LocationEntity> findById(@PathVariable UUID id) {
-        return ResponseEntity.ok(locationService.findById(id));
+    public ResponseEntity<LocationResponse> findById(@PathVariable UUID id) {
+        LocationResponse location = locationService.findById(id);
+        return ResponseEntity.ok(location);
+    }
+
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
+    @PutMapping("/{id}")
+    public ResponseEntity<LocationResponse> update(
+            @PathVariable UUID id,
+            @RequestBody LocationRequest request
+    ) {
+        LocationResponse updated = locationService.update(id, request);
+        return ResponseEntity.ok(updated);
     }
 
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> delete(@PathVariable UUID id) {
-        locationService.delete(id);
+        locationService.delete(id); // Validación interna
         return ResponseEntity.noContent().build();
     }
 }

src/main/java/com/classes/controllers/TrainerController.java

@@ -1,22 +1,19 @@
 package com.classes.controllers;
 
-import com.classes.annotations.AdminAccess;
-import com.classes.annotations.AdminOrTrainerAccess;
-import com.classes.dtos.TrainerDTO;
+import com.classes.dtos.Trainer.TrainerDTO;
+import com.classes.services.AuthorizationService;
 import com.classes.services.TrainerService;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import com.fasterxml.jackson.databind.SerializationFeature;
 import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.security.core.Authentication;
-import org.springframework.security.core.authority.SimpleGrantedAuthority;
-import org.springframework.security.core.context.SecurityContextHolder;
-import org.springframework.security.oauth2.server.resource.authentication.JwtAuthenticationToken;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
 
@@ -29,13 +26,17 @@
 @RestController
 @RequestMapping("/api/trainers")
 @RequiredArgsConstructor
+@Slf4j
 public class TrainerController {
 
     private final TrainerService trainerService;
+    private final AuthorizationService authService;
 
-    @AdminAccess
+/*probado*/
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<TrainerDTO> createTrainer(
+            Authentication authentication,
             @RequestParam("trainer") String trainerJson,
             @RequestParam(value = "profileImage", required = false) MultipartFile profileImage,
             @RequestParam(value = "certifications", required = false) List<MultipartFile> certifications
@@ -47,22 +48,23 @@ public ResponseEntity<TrainerDTO> createTrainer(
         TrainerDTO createdTrainer = trainerService.createTrainer(trainerDTO, profileImage, certifications);
         return ResponseEntity.status(HttpStatus.CREATED).body(createdTrainer);
     }
-
-    @PreAuthorize("@authService.canAccessResource(#id, authentication)")
+    /*probado*/
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @GetMapping("/{id}")
     public ResponseEntity<TrainerDTO> getTrainerById(@PathVariable UUID id) {
         TrainerDTO trainer = trainerService.getTrainerById(id);
         return ResponseEntity.ok(trainer);
     }
 
-    @AdminAccess
+    //probado
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @GetMapping
     public ResponseEntity<List<TrainerDTO>> getAllTrainers() {
         List<TrainerDTO> trainers = trainerService.getAllTrainers();
         return ResponseEntity.ok(trainers);
     }
 
-    @PreAuthorize("@authService.canAccessResource(#ownerId, authentication)")
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id, authentication)")
     @PutMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<TrainerDTO> updateTrainer(
             @PathVariable UUID id,
@@ -79,6 +81,7 @@ public ResponseEntity<TrainerDTO> updateTrainer(
     }
 
 
+    @PreAuthorize("@authorizationServiceImpl.canAccessResource(#id,authentication)")
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteTrainer(@PathVariable UUID id) {
         try {
@@ -94,3 +97,4 @@ public ResponseEntity<Void> deleteTrainer(@PathVariable UUID id) {
     }
 }
 
+

src/main/java/com/classes/dtos/ClassDTO.java → src/main/java/com/classes/dtos/Class/ClassRequest.java

@@ -1,23 +1,26 @@
-package com.classes.dtos;
+package com.classes.dtos.Class;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
 import lombok.Data;
+import lombok.NoArgsConstructor;
 
 import java.time.LocalDate;
 import java.time.LocalTime;
 import java.util.UUID;
 
 @Data
-public class ClassDTO {
-    private UUID id;
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClassRequest {
     private String className;
     private UUID locationId;
+    private UUID trainerId;
     @JsonFormat(pattern = "dd-MM-yyyy")
     private LocalDate classDate;
     private int duration;
-    private UUID trainerId;
     private int maxCapacity;
     private LocalTime startTime;
     private boolean active;
     private String description;
-}
+}

src/main/java/com/classes/dtos/Class/ClassResponse.java

@@ -0,0 +1,28 @@
+package com.classes.dtos.Class;
+
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.UUID;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ClassResponse {
+    private UUID id;
+    private String className;
+    private String locationName;
+    private String trainerName;
+    @JsonFormat(pattern = "dd-MM-yyyy")
+    private LocalDate classDate;
+    private int duration;
+    private int maxCapacity;
+    private LocalTime startTime;
+    private boolean active;
+    private String description;
+}

src/main/java/com/classes/dtos/LocationDTO.java → src/main/java/com/classes/dtos/Location/LocationRequest.java

@@ -1,10 +1,9 @@
-package com.classes.dtos;
-
+package com.classes.dtos.Location;
 
 import lombok.Data;
 
 @Data
-public class LocationDTO {
+public class LocationRequest {
     private String name;
     private String description;
     private int ability;

src/main/java/com/classes/dtos/Location/LocationResponse.java

@@ -0,0 +1,14 @@
+package com.classes.dtos.Location;
+
+import lombok.Data;
+
+import java.util.UUID;
+
+@Data
+public class LocationResponse {
+    private UUID id; // si tienes un ID generado
+    private String name;
+    private String description;
+    private int ability;
+    private boolean active;
+}

src/main/java/com/classes/dtos/FileResponseDTO.java → src/main/java/com/classes/dtos/Trainer/FileResponseDTO.java

@@ -1,4 +1,4 @@
-package com.classes.dtos;
+package com.classes.dtos.Trainer;
 
 import lombok.AllArgsConstructor;
 import lombok.Data;

src/main/java/com/classes/dtos/TrainerDTO.java → src/main/java/com/classes/dtos/Trainer/TrainerDTO.java

@@ -1,4 +1,4 @@
-package com.classes.dtos;
+package com.classes.dtos.Trainer;
 
 import com.classes.enums.ContractType;
 import com.classes.enums.DayAvailability;

src/main/java/com/classes/entities/ClassEntity.java

@@ -21,18 +21,23 @@ public class ClassEntity {
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
     private String name;
-//    private UUID LocationId;
+
     private String className;
     private int duration;
-    private UUID trainerId;
+
     private int maxCapacity;
     private LocalTime startTime;
     private boolean active;
     private String description;
+
     @ManyToOne
     @JoinColumn(name = "location_id")
     private LocationEntity location;
 
+    @ManyToOne
+    @JoinColumn(name = "trainer_id")
+    private TrainerEntity trainer;
+
     @Embedded
     private Audit audit;
 }

src/main/java/com/classes/entities/TrainerEntity.java

@@ -65,6 +65,7 @@ public class TrainerEntity {
     private BigDecimal salaryPerClass;
     private String bankInfo;
     private String notes;
+
     @Embedded
     private Audit audit;