4 feat/classes

pom.xml

@@ -176,7 +176,6 @@
     </dependencyManagement>
 
 
-
     <build>
         <plugins>
             <plugin>

src/main/java/com/classes/config/SecurityConfig.java

@@ -30,7 +30,8 @@ public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Excepti
                                 "/swagger-ui/**",
                                 "/v3/api-docs/**",
                                 "/saludo",
-                                "/"
+                                "/",
+                                "/test/**"
                         ).permitAll()
                         .anyRequest().authenticated()
                 )

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

@@ -0,0 +1,45 @@
+package com.classes.controllers;
+
+import com.classes.dtos.ClassDTO;
+import com.classes.services.ClassService;
+import org.springframework.web.bind.annotation.PostMapping;
+import lombok.RequiredArgsConstructor;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+import java.util.UUID;
+
+@RestController
+@RequestMapping("/api/classes")
+@RequiredArgsConstructor
+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);
+    }
+
+    @GetMapping
+    public ResponseEntity<List<ClassDTO>> findAllClasses() {
+        List<ClassDTO> 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);
+        return ResponseEntity.ok(updated);
+    }
+
+    @DeleteMapping("/{id}")
+    public ResponseEntity<String> deleteClass(@PathVariable UUID id) {
+        classService.deleteClass(id);
+        return ResponseEntity.ok("Clase eliminada correctamente");
+    }
+}

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

@@ -1,12 +1,15 @@
 package com.classes.controllers;
 
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 @RestController
-@RequestMapping("/saludo")
+@RequestMapping("/test")
 public class HelloController {
-    public String saludo() {
-        return "Microservicio de clases activo";
+    @GetMapping("saludo")
+    public ResponseEntity<String> saludo() {
+        return ResponseEntity.ok("Microservicio de clases activo");
     }
 }

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

@@ -1,5 +1,7 @@
 package com.classes.controllers;
 
+import com.classes.annotations.AdminAccess;
+import com.classes.annotations.AdminOrTrainerAccess;
 import com.classes.dtos.TrainerDTO;
 import com.classes.services.TrainerService;
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -10,6 +12,11 @@
 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;
 
@@ -26,6 +33,7 @@ public class TrainerController {
 
     private final TrainerService trainerService;
 
+    @AdminAccess
     @PostMapping(consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<TrainerDTO> createTrainer(
             @RequestParam("trainer") String trainerJson,
@@ -40,18 +48,21 @@ public ResponseEntity<TrainerDTO> createTrainer(
         return ResponseEntity.status(HttpStatus.CREATED).body(createdTrainer);
     }
 
+    @PreAuthorize("@authService.canAccessResource(#id, authentication)")
     @GetMapping("/{id}")
     public ResponseEntity<TrainerDTO> getTrainerById(@PathVariable UUID id) {
         TrainerDTO trainer = trainerService.getTrainerById(id);
         return ResponseEntity.ok(trainer);
     }
 
+    @AdminAccess
     @GetMapping
     public ResponseEntity<List<TrainerDTO>> getAllTrainers() {
         List<TrainerDTO> trainers = trainerService.getAllTrainers();
         return ResponseEntity.ok(trainers);
     }
 
+    @PreAuthorize("@authService.canAccessResource(#ownerId, authentication)")
     @PutMapping(value = "/{id}", consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<TrainerDTO> updateTrainer(
             @PathVariable UUID id,
@@ -67,14 +78,17 @@ public ResponseEntity<TrainerDTO> updateTrainer(
         return ResponseEntity.ok(updatedTrainer);
     }
 
+
     @DeleteMapping("/{id}")
     public ResponseEntity<Void> deleteTrainer(@PathVariable UUID id) {
         try {
             trainerService.deleteTrainer(id);
             return ResponseEntity.noContent().build();
-        } catch (EntityNotFoundException e) {
+        } catch (
+                EntityNotFoundException e) {
             return ResponseEntity.notFound().build();
-        } catch (IOException e) {
+        } catch (
+                IOException e) {
             return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR).build();
         }
     }

src/main/java/com/classes/dtos/ClassDTO.java

@@ -0,0 +1,23 @@
+package com.classes.dtos;
+
+import com.fasterxml.jackson.annotation.JsonFormat;
+import lombok.Data;
+
+import java.time.LocalDate;
+import java.time.LocalTime;
+import java.util.UUID;
+
+@Data
+public class ClassDTO {
+    private UUID id;
+    private String className;
+    private UUID locationId;
+    @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/TrainerDTO.java

@@ -1,9 +1,9 @@
 package com.classes.dtos;
 
-import com.classes.Enums.ContractType;
-import com.classes.Enums.DayAvailability;
-import com.classes.Enums.Gender;
-import com.classes.Enums.TrainerStatus;
+import com.classes.enums.ContractType;
+import com.classes.enums.DayAvailability;
+import com.classes.enums.Gender;
+import com.classes.enums.TrainerStatus;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Data;
 
@@ -18,7 +18,7 @@ public class TrainerDTO {
     private String lastName;
     private String dni;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "dd-MM-yyyy")
     private LocalDate birthDate;
 
     private Gender gender;
@@ -32,7 +32,7 @@ public class TrainerDTO {
     private List<String> certifications;
     private Set<DayAvailability> availability;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "dd-MM-yyyy")
     private LocalDate hireDate;
 
     private TrainerStatus status;

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

@@ -5,6 +5,8 @@
 import jakarta.persistence.*;
 import lombok.*;
 
+import java.time.LocalDate;
+import java.time.LocalTime;
 import java.util.UUID;
 
 @Entity
@@ -18,13 +20,19 @@ public class ClassEntity {
     @Id
     @GeneratedValue(strategy = GenerationType.UUID)
     private UUID id;
-    private String title;
-    @Column(length = 2000)
-    private String description;
-    @Column(name = "trainer_id")
+    private String name;
+//    private UUID LocationId;
+    private String className;
+    private int duration;
     private UUID trainerId;
-    @Column(name = "max_capacity")
-    private Integer maxCapacity;
+    private int maxCapacity;
+    private LocalTime startTime;
+    private boolean active;
+    private String description;
+    @ManyToOne
+    @JoinColumn(name = "location_id")
+    private LocationEntity location;
+
     @Embedded
     private Audit audit;
 }

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

@@ -1,9 +1,9 @@
 package com.classes.entities;
 
-import com.classes.Enums.ContractType;
-import com.classes.Enums.DayAvailability;
-import com.classes.Enums.Gender;
-import com.classes.Enums.TrainerStatus;
+import com.classes.enums.ContractType;
+import com.classes.enums.DayAvailability;
+import com.classes.enums.Gender;
+import com.classes.enums.TrainerStatus;
 import com.classes.config.Audit;
 import com.classes.config.AuditListener;
 import jakarta.persistence.*;

src/main/java/com/classes/Enums/ContractType.java → src/main/java/com/classes/enums/ContractType.java

@@ -1,4 +1,4 @@
-package com.classes.Enums;
+package com.classes.enums;
 
 public enum ContractType {
     TIEMPO_COMPLETO,

src/main/java/com/classes/Enums/DayAvailability.java → src/main/java/com/classes/enums/DayAvailability.java

@@ -1,4 +1,4 @@
-package com.classes.Enums;
+package com.classes.enums;
 
 
 public enum DayAvailability {

src/main/java/com/classes/Enums/Gender.java → src/main/java/com/classes/enums/Gender.java

@@ -1,4 +1,4 @@
-package com.classes.Enums;
+package com.classes.enums;
 
 public enum Gender {
     MASCULINO,       // Masculino

src/main/java/com/classes/Enums/TrainerStatus.java → src/main/java/com/classes/enums/TrainerStatus.java

@@ -1,4 +1,4 @@
-package com.classes.Enums;
+package com.classes.enums;
 
 public enum TrainerStatus {
     ACTIVO,         // Entrenador activo

src/main/java/com/classes/exceptions/GlobalExceptionController.java

@@ -1,12 +1,14 @@
 package com.classes.exceptions;
 
+import jakarta.persistence.EntityNotFoundException;
 import jakarta.validation.ConstraintViolationException;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.dao.InvalidDataAccessApiUsageException;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.http.converter.HttpMessageNotReadableException;
 //import org.springframework.security.access.AccessDeniedException;
+import org.springframework.security.access.AccessDeniedException;
 import org.springframework.web.HttpRequestMethodNotSupportedException;
 import org.springframework.web.bind.MethodArgumentNotValidException;
 import org.springframework.web.bind.annotation.ExceptionHandler;
@@ -108,19 +110,28 @@ public ResponseEntity<ErrorResponse> handleNoHandlerFoundException(NoHandlerFoun
         return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
     }
 
-//    @ExceptionHandler(AccessDeniedException.class)
-//    public ResponseEntity<ErrorResponse> handleAccessDeniedException(AccessDeniedException ex) {
-//        ErrorResponse errorResponse = new ErrorResponse(
-//                "ACCESS_DENIED",
-//                "Acceso denegado",
-//                Collections.singletonList("No tienes los permisos necesarios para realizar esta acción")
-//        );
-//
-//        log.warn("Access denied for user");
-//        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(errorResponse);
-//    }
+    @ExceptionHandler(AccessDeniedException.class)
+    public ResponseEntity<ErrorResponse> handleAccessDeniedException(AccessDeniedException ex) {
+        ErrorResponse errorResponse = new ErrorResponse(
+                "ACCESS_DENIED",
+                "Acceso denegado",
+                Collections.singletonList("No tienes los permisos necesarios para realizar esta acción")
+        );
 
+        log.warn("Access denied for user");
+        return ResponseEntity.status(HttpStatus.FORBIDDEN).body(errorResponse);
+    }
 
 
+    @ExceptionHandler(EntityNotFoundException.class)
+    public ResponseEntity<ErrorResponse> handleEntityNotFoundException(EntityNotFoundException ex) {
+        ErrorResponse errorResponse = new ErrorResponse(
+                "ENTITY_NOT_FOUND",
+                "No se encontró la entidad solicitada",
+                List.of(ex.getMessage())
+        );
+        log.warn("Entity not found: {}", ex.getMessage());
+        return ResponseEntity.status(HttpStatus.NOT_FOUND).body(errorResponse);
+    }
 
 }

src/main/java/com/classes/mappers/ClassMapper.java

@@ -0,0 +1,24 @@
+package com.classes.mappers;
+
+import com.classes.config.MapStructConfig;
+import com.classes.dtos.ClassDTO;
+import com.classes.dtos.LocationDTO;
+import com.classes.entities.ClassEntity;
+import com.classes.entities.LocationEntity;
+import org.mapstruct.BeanMapping;
+import org.mapstruct.Mapper;
+import org.mapstruct.MappingTarget;
+import org.mapstruct.NullValuePropertyMappingStrategy;
+
+import java.util.List;
+
+@Mapper(config = MapStructConfig.class)
+public interface ClassMapper {
+    ClassEntity toEntity(ClassDTO dto);
+    ClassDTO toDTO(ClassEntity entity);
+    List<ClassDTO> toDTOList(List<ClassEntity> entities);
+    @BeanMapping(nullValuePropertyMappingStrategy = NullValuePropertyMappingStrategy.IGNORE)
+    void updateFromDto(ClassDTO dto, @MappingTarget ClassEntity entity);
+
+
+}

src/main/java/com/classes/repositories/ClassRepository.java

@@ -0,0 +1,15 @@
+package com.classes.repositories;
+
+import com.classes.entities.ClassEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+import java.util.Optional;
+import java.util.UUID;
+
+@Repository
+public interface ClassRepository extends JpaRepository<ClassEntity, UUID> {
+    Optional<ClassEntity> findFirstByTrainerId(UUID trainerId);
+    Optional<ClassEntity> findFirstByLocationId(UUID locationId);
+
+}

src/main/java/com/classes/services/ClassService.java

@@ -0,0 +1,14 @@
+package com.classes.services;
+
+import com.classes.dtos.ClassDTO;
+
+import java.util.List;
+import java.util.UUID;
+
+public interface ClassService {
+
+    ClassDTO createClass(ClassDTO dto);
+    List<ClassDTO> findAll();
+    ClassDTO updateClass(UUID id, ClassDTO dto);
+    void deleteClass(UUID id);
+}