From bf397a1bbd439b96390ce28da1ce4fd1ef0c070a Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:16:58 -0300 Subject: [PATCH 01/18] entities --- .../api/domain/entities/Establishment.java | 35 +++++++++++++++ .../parking/api/domain/entities/Parking.java | 38 ++++++++++++++++ .../parking/api/domain/entities/Vehicle.java | 45 +++++++++++++++++++ 3 files changed, 118 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/domain/entities/Establishment.java create mode 100644 src/main/java/com/fcamara/parking/api/domain/entities/Parking.java create mode 100644 src/main/java/com/fcamara/parking/api/domain/entities/Vehicle.java diff --git a/src/main/java/com/fcamara/parking/api/domain/entities/Establishment.java b/src/main/java/com/fcamara/parking/api/domain/entities/Establishment.java new file mode 100644 index 00000000..10691fd9 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/entities/Establishment.java @@ -0,0 +1,35 @@ +package com.fcamara.parking.api.domain.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Data +@Entity +public class Establishment { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + private String name; + + private String cnpj; + + private String address; + + private String phone; + + private Integer motorcycleSpots; + + private Integer carSpots; +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/domain/entities/Parking.java b/src/main/java/com/fcamara/parking/api/domain/entities/Parking.java new file mode 100644 index 00000000..d8f07305 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/entities/Parking.java @@ -0,0 +1,38 @@ +package com.fcamara.parking.api.domain.entities; + +import jakarta.persistence.Entity; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.persistence.ManyToOne; +import jakarta.validation.constraints.NotNull; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +import java.time.LocalDateTime; + +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Data +@Entity +public class Parking { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @ManyToOne + private Vehicle vehicle; + + @ManyToOne + private Establishment establishment; + + @NotNull + private LocalDateTime entryTime; + + private LocalDateTime exitTime; +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/domain/entities/Vehicle.java b/src/main/java/com/fcamara/parking/api/domain/entities/Vehicle.java new file mode 100644 index 00000000..a2eb56c8 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/entities/Vehicle.java @@ -0,0 +1,45 @@ +package com.fcamara.parking.api.domain.entities; + +import com.fcamara.parking.api.domain.enums.VehicleType; +import jakarta.persistence.Entity; +import jakarta.persistence.EnumType; +import jakarta.persistence.Enumerated; +import jakarta.persistence.GeneratedValue; +import jakarta.persistence.GenerationType; +import jakarta.persistence.Id; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.antlr.v4.runtime.misc.NotNull; + +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Data +@Entity +public class Vehicle { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + private Long id; + + @NotNull + private String brand; + + @NotNull + private String model; + + @NotNull + private String color; + + @NotNull + @Size(min = 7, max = 7) + private String licensePlate; + + @NotNull + @Enumerated(EnumType.STRING) + private VehicleType type; +} \ No newline at end of file From 793a18ed86c4376e17e22fc92d59593d7ce5de7d Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:30:36 -0300 Subject: [PATCH 02/18] repositories --- .../api/repositories/EstablishmentRepository.java | 9 +++++++++ .../api/repositories/ParkingRepository.java | 15 +++++++++++++++ .../api/repositories/VehicleRepository.java | 9 +++++++++ 3 files changed, 33 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/repositories/EstablishmentRepository.java create mode 100644 src/main/java/com/fcamara/parking/api/repositories/ParkingRepository.java create mode 100644 src/main/java/com/fcamara/parking/api/repositories/VehicleRepository.java diff --git a/src/main/java/com/fcamara/parking/api/repositories/EstablishmentRepository.java b/src/main/java/com/fcamara/parking/api/repositories/EstablishmentRepository.java new file mode 100644 index 00000000..88473702 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/repositories/EstablishmentRepository.java @@ -0,0 +1,9 @@ +package com.fcamara.parking.api.repositories; + +import com.fcamara.parking.api.domain.entities.Establishment; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface EstablishmentRepository extends JpaRepository { +} diff --git a/src/main/java/com/fcamara/parking/api/repositories/ParkingRepository.java b/src/main/java/com/fcamara/parking/api/repositories/ParkingRepository.java new file mode 100644 index 00000000..b26ec33d --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/repositories/ParkingRepository.java @@ -0,0 +1,15 @@ +package com.fcamara.parking.api.repositories; + +import com.fcamara.parking.api.domain.entities.Parking; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +import java.util.List; + +@Repository +public interface ParkingRepository extends JpaRepository { + + List findByVehicleId(Long vehicleId); + + List findByEstablishmentId(Long establishmentId); +} diff --git a/src/main/java/com/fcamara/parking/api/repositories/VehicleRepository.java b/src/main/java/com/fcamara/parking/api/repositories/VehicleRepository.java new file mode 100644 index 00000000..a6e08539 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/repositories/VehicleRepository.java @@ -0,0 +1,9 @@ +package com.fcamara.parking.api.repositories; + +import com.fcamara.parking.api.domain.entities.Vehicle; +import org.springframework.data.jpa.repository.JpaRepository; +import org.springframework.stereotype.Repository; + +@Repository +public interface VehicleRepository extends JpaRepository { +} From 14e64008afcf71e57bbb3a2f7f30db376c14288d Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:40:14 -0300 Subject: [PATCH 03/18] mappers --- .../api/mappers/EstablishmentMapper.java | 34 +++++++++++++++++++ .../parking/api/mappers/VehicleMapper.java | 34 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/mappers/EstablishmentMapper.java create mode 100644 src/main/java/com/fcamara/parking/api/mappers/VehicleMapper.java diff --git a/src/main/java/com/fcamara/parking/api/mappers/EstablishmentMapper.java b/src/main/java/com/fcamara/parking/api/mappers/EstablishmentMapper.java new file mode 100644 index 00000000..9d69d230 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/mappers/EstablishmentMapper.java @@ -0,0 +1,34 @@ +package com.fcamara.parking.api.mappers; + +import com.fcamara.parking.api.domain.dto.EstablishmentPostDTO; +import com.fcamara.parking.api.domain.entities.Establishment; + +public class EstablishmentMapper { + public static Establishment toEntity(EstablishmentPostDTO dto) { + if (dto == null) { + return null; + } + return Establishment.builder() + .name(dto.getName()) + .cnpj(dto.getCnpj()) + .address(dto.getAddress()) + .phone(dto.getPhone()) + .motorcycleSpots(dto.getMotorcycleSpots()) + .carSpots(dto.getCarSpots()) + .build(); + } + + public static EstablishmentPostDTO toDTO(Establishment establishment) { + if (establishment == null) { + return null; + } + return EstablishmentPostDTO.builder() + .name(establishment.getName()) + .cnpj(establishment.getCnpj()) + .address(establishment.getAddress()) + .phone(establishment.getPhone()) + .motorcycleSpots(establishment.getMotorcycleSpots()) + .carSpots(establishment.getCarSpots()) + .build(); + } +} diff --git a/src/main/java/com/fcamara/parking/api/mappers/VehicleMapper.java b/src/main/java/com/fcamara/parking/api/mappers/VehicleMapper.java new file mode 100644 index 00000000..3bf50048 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/mappers/VehicleMapper.java @@ -0,0 +1,34 @@ +package com.fcamara.parking.api.mappers; + +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.domain.dto.VehiclePostDTO; + +public class VehicleMapper { + public static Vehicle toEntity(VehiclePostDTO dto) { + if (dto == null) { + return null; + } + + return Vehicle.builder() + .brand(dto.getBrand()) + .model(dto.getModel()) + .color(dto.getColor()) + .licensePlate(dto.getLicensePlate()) + .type(dto.getType()) + .build(); + } + + public static VehiclePostDTO toDTO(Vehicle vehicle) { + if (vehicle == null) { + return null; + } + + return VehiclePostDTO.builder() + .brand(vehicle.getBrand()) + .model(vehicle.getModel()) + .color(vehicle.getColor()) + .licensePlate(vehicle.getLicensePlate()) + .type(vehicle.getType()) + .build(); + } +} From ecbb072b16d8d408ebbe8bea02087f719ed82819 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:40:55 -0300 Subject: [PATCH 04/18] domain --- .../api/domain/dto/EstablishmentPostDTO.java | 39 +++++++++++++++++++ .../api/domain/dto/ParkingPostDTO.java | 14 +++++++ .../api/domain/dto/VehiclePostDTO.java | 36 +++++++++++++++++ .../parking/api/domain/enums/VehicleType.java | 5 +++ 4 files changed, 94 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/domain/dto/EstablishmentPostDTO.java create mode 100644 src/main/java/com/fcamara/parking/api/domain/dto/ParkingPostDTO.java create mode 100644 src/main/java/com/fcamara/parking/api/domain/dto/VehiclePostDTO.java create mode 100644 src/main/java/com/fcamara/parking/api/domain/enums/VehicleType.java diff --git a/src/main/java/com/fcamara/parking/api/domain/dto/EstablishmentPostDTO.java b/src/main/java/com/fcamara/parking/api/domain/dto/EstablishmentPostDTO.java new file mode 100644 index 00000000..83e5ff18 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/dto/EstablishmentPostDTO.java @@ -0,0 +1,39 @@ +package com.fcamara.parking.api.domain.dto; + +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; +import org.antlr.v4.runtime.misc.NotNull; + +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Data +public class EstablishmentPostDTO { + private Long id; + + @NotBlank(message = "O nome é obrigatória") + private String name; + + @NotBlank(message = "O CNPJ é obrigatório") + @Size(min = 14, max = 14) + private String cnpj; + + @NotBlank(message = "O endereço é obrigatório") + private String address; + + @NotBlank(message = "O telefone é obrigatório") + private String phone; + + @NotBlank(message = "Quantidade de vagas para motos é obrigatória") + @NotNull + private Integer motorcycleSpots; + + @NotBlank(message = "Quantidade de vagas para carros é obrigatória") + private Integer carSpots; +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/domain/dto/ParkingPostDTO.java b/src/main/java/com/fcamara/parking/api/domain/dto/ParkingPostDTO.java new file mode 100644 index 00000000..12e8b65a --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/dto/ParkingPostDTO.java @@ -0,0 +1,14 @@ +package com.fcamara.parking.api.domain.dto; + +import jakarta.validation.constraints.NotBlank; + +import java.time.LocalDateTime; + +public class ParkingPostDTO { + @NotBlank(message = "O veículo é obrigatório") + private Long vehicleId; + @NotBlank(message = "O estabelecimento é obrigatório") + private Long establishmentId; + @NotBlank(message = "A entrada é obrigatória") + private LocalDateTime entryTime; +} diff --git a/src/main/java/com/fcamara/parking/api/domain/dto/VehiclePostDTO.java b/src/main/java/com/fcamara/parking/api/domain/dto/VehiclePostDTO.java new file mode 100644 index 00000000..f5689a0a --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/dto/VehiclePostDTO.java @@ -0,0 +1,36 @@ +package com.fcamara.parking.api.domain.dto; + +import com.fcamara.parking.api.domain.enums.VehicleType; +import jakarta.validation.constraints.NotBlank; +import jakarta.validation.constraints.NotNull; +import jakarta.validation.constraints.Size; +import lombok.AllArgsConstructor; +import lombok.Builder; +import lombok.Data; +import lombok.EqualsAndHashCode; +import lombok.NoArgsConstructor; + +@Builder +@EqualsAndHashCode +@NoArgsConstructor +@AllArgsConstructor +@Data +public class VehiclePostDTO { + private Long id; + + @NotBlank(message = "A marca é obrigatória") + private String brand; + + @NotBlank(message = "O modelo é obrigatório") + private String model; + + @NotBlank(message = "A cor é obrigatória") + private String color; + + @NotNull + @Size(min = 7, max = 7, message = "O mínimo e o máximo de caracteres é 7") + private String licensePlate; + + @NotNull(message = "O tipo não pode ser nulo") + private VehicleType type; +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/domain/enums/VehicleType.java b/src/main/java/com/fcamara/parking/api/domain/enums/VehicleType.java new file mode 100644 index 00000000..3ed81613 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/domain/enums/VehicleType.java @@ -0,0 +1,5 @@ +package com.fcamara.parking.api.domain.enums; + +public enum VehicleType { + CAR, MOTORCYCLE +} \ No newline at end of file From 6e7846508711a5becfe71c8f2433a777ec8d616a Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:41:24 -0300 Subject: [PATCH 05/18] services --- .../api/services/AbstractReportService.java | 57 +++++++++ .../api/services/EstablishmentService.java | 38 ++++++ .../parking/api/services/ParkingService.java | 60 +++++++++ .../api/services/ReportParkingService.java | 120 ++++++++++++++++++ .../parking/api/services/VehicleService.java | 38 ++++++ 5 files changed, 313 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/services/AbstractReportService.java create mode 100644 src/main/java/com/fcamara/parking/api/services/EstablishmentService.java create mode 100644 src/main/java/com/fcamara/parking/api/services/ParkingService.java create mode 100644 src/main/java/com/fcamara/parking/api/services/ReportParkingService.java create mode 100644 src/main/java/com/fcamara/parking/api/services/VehicleService.java diff --git a/src/main/java/com/fcamara/parking/api/services/AbstractReportService.java b/src/main/java/com/fcamara/parking/api/services/AbstractReportService.java new file mode 100644 index 00000000..0638fcfd --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/services/AbstractReportService.java @@ -0,0 +1,57 @@ +package com.fcamara.parking.api.services; + +import com.itextpdf.kernel.pdf.PdfDocument; +import com.itextpdf.kernel.pdf.PdfWriter; +import com.itextpdf.layout.Document; +import com.itextpdf.layout.element.Paragraph; +import com.itextpdf.layout.element.Table; +import org.springframework.core.io.InputStreamResource; + +import java.io.ByteArrayInputStream; +import java.io.ByteArrayOutputStream; +import java.util.List; +import java.util.Map; + +public abstract class AbstractReportService { + + public InputStreamResource generateReport(String title, List columnHeaders, List> rows, Map summary) { + ByteArrayOutputStream outStream = new ByteArrayOutputStream(); + + try { + PdfWriter writer = new PdfWriter(outStream); + PdfDocument pdfDoc = new PdfDocument(writer); + Document document = new Document(pdfDoc); + + document.add(new Paragraph(title)); + + float[] columnWidths = new float[columnHeaders.size()]; + for (int i = 0; i < columnHeaders.size(); i++) { + columnWidths[i] = 150F; + } + Table table = new Table(columnWidths); + + for (String header : columnHeaders) { + table.addCell(header); + } + + for (Map row : rows) { + for (String header : columnHeaders) { + table.addCell(row.get(header)); + } + } + + document.add(table); + + document.add(new Paragraph("\nResumo:")); + for (Map.Entry entry : summary.entrySet()) { + document.add(new Paragraph(entry.getKey() + ": " + entry.getValue())); + } + + document.close(); + } catch (Exception e) { + e.printStackTrace(); + } + + return new InputStreamResource(new ByteArrayInputStream(outStream.toByteArray())); + } +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/services/EstablishmentService.java b/src/main/java/com/fcamara/parking/api/services/EstablishmentService.java new file mode 100644 index 00000000..ca330bfb --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/services/EstablishmentService.java @@ -0,0 +1,38 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.dto.EstablishmentPostDTO; +import com.fcamara.parking.api.domain.entities.Establishment; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.mappers.EstablishmentMapper; +import com.fcamara.parking.api.repositories.EstablishmentRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@AllArgsConstructor +@Service +public class EstablishmentService { + private final EstablishmentRepository establishmentRepository; + + public Establishment create(EstablishmentPostDTO establishment) { + return establishmentRepository.save(EstablishmentMapper.toEntity(establishment)); + } + + public Establishment getById(Long id) { + return establishmentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Estabelecimento não encontrado")); + } + + public List getAll() { + return establishmentRepository.findAll(); + } + + public Establishment update(Long id, EstablishmentPostDTO establishment) { + establishmentRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Estabelecimento não encontrado")); + return establishmentRepository.save(EstablishmentMapper.toEntity(establishment)); + } + + public void delete(Long id) { + establishmentRepository.deleteById(id); + } +} diff --git a/src/main/java/com/fcamara/parking/api/services/ParkingService.java b/src/main/java/com/fcamara/parking/api/services/ParkingService.java new file mode 100644 index 00000000..929b6e93 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/services/ParkingService.java @@ -0,0 +1,60 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.entities.Parking; +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.domain.entities.Establishment; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.repositories.ParkingRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +@AllArgsConstructor +@Service +public class ParkingService { + + private final ParkingRepository parkingRepository; + private final VehicleService vehicleService; + private final EstablishmentService establishmentService; + + public Parking registerEntry(Long vehicleId, Long establishmentId) { + Vehicle vehicle = vehicleService.getById(vehicleId); + Establishment establishment = establishmentService.getById(establishmentId); + + Parking parking = Parking.builder() + .vehicle(vehicle) + .establishment(establishment) + .entryTime(LocalDateTime.now()) + .build(); + return parkingRepository.save(parking); + } + + public Parking registerExit(Long parkingId) { + Optional parkingOpt = parkingRepository.findById(parkingId); + + if (parkingOpt.isPresent()) { + Parking parking = parkingOpt.get(); + parking.setExitTime(LocalDateTime.now()); + + return parkingRepository.save(parking); + } else { + throw new ResourceNotFoundException("Controle de entrarada com id " + parkingId + " não encontrado"); + } + } + + public List getAll() { + return parkingRepository.findAll(); + } + + public List getParkingsByVehicle(Long vehicleId) { + return parkingRepository.findByVehicleId(vehicleId); + } + + public List getParkingsByEstablishment(Long establishmentId) { + return parkingRepository.findByEstablishmentId(establishmentId); + } + +} diff --git a/src/main/java/com/fcamara/parking/api/services/ReportParkingService.java b/src/main/java/com/fcamara/parking/api/services/ReportParkingService.java new file mode 100644 index 00000000..4bee0bc9 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/services/ReportParkingService.java @@ -0,0 +1,120 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.entities.Parking; +import lombok.AllArgsConstructor; +import org.springframework.core.io.InputStreamResource; +import org.springframework.stereotype.Service; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.util.*; +import java.util.stream.Collectors; + +import static com.fcamara.parking.api.utils.DateUtil.convertToLocalDateTime; +import static com.fcamara.parking.api.utils.DateUtil.formatDate; + +@AllArgsConstructor +@Service +public class ReportParkingService extends AbstractReportService { + + private final ParkingService parkingService; + private final EstablishmentService establishmentService; + + public InputStreamResource report(Long establishmentId, String dateTimeInitial, String dateTimeFinal) { + var establishment = establishmentService.getById(establishmentId); + + String title = "Relatório de Estacionamento - " + establishment.getName(); + List columnHeaders = Arrays.asList("Veículo", "Placa", "Tipo", "Data/Hora Entrada", "Data/Hora Saída"); + List> rows = new ArrayList<>(); + + LocalDateTime localDateTimeInitial = Objects.isNull(dateTimeInitial) ? null : convertToLocalDateTime(dateTimeInitial); + LocalDateTime localDateTimeFinal = Objects.isNull(dateTimeFinal) ? null : convertToLocalDateTime(dateTimeFinal); + List parkingList = parkingService.getParkingsByEstablishment(establishment.getId()).stream() + .filter(parking -> (localDateTimeInitial == null || parking.getEntryTime().isAfter(localDateTimeInitial) || parking.getEntryTime().isEqual(localDateTimeInitial)) + && (localDateTimeFinal == null || parking.getEntryTime().isBefore(localDateTimeFinal) || parking.getEntryTime().isEqual(localDateTimeFinal))) + .toList(); + + for (Parking parking : parkingList) { + Map row = new HashMap<>(); + row.put("Veículo", parking.getVehicle().getModel()); + row.put("Placa", parking.getVehicle().getLicensePlate()); + row.put("Tipo", parking.getVehicle().getType().name()); + row.put("Data/Hora Entrada", formatDate(parking.getEntryTime(), "dd/MM/yyyy hh:mm:ss")); + row.put("Data/Hora Saída", parking.getExitTime() != null ? formatDate(parking.getExitTime(), "dd/MM/yyyy hh:mm:ss") : "Estacionado"); + + rows.add(row); + } + + Map summary = new HashMap<>(); + summary.put("Total de Entradas", (long) parkingList.size()); + summary.put("Total de Saídas", parkingList.stream().filter(parking -> parking.getExitTime() != null).count()); + + return generateReport(title, columnHeaders, rows, summary); + } + + + public Map getSummaryOfEntriesAndExits() { + List parkings = parkingService.getAll(); + long totalEntries = parkings.stream().filter(m -> m.getEntryTime() != null).count(); + long totalExits = parkings.stream().filter(m -> m.getExitTime() != null).count(); + + return Map.of( + "totalEntries", totalEntries, + "totalExits", totalExits + ); + } + + public Map getSummaryOfEntriesAndExitsByHour() { + List parkings = parkingService.getAll(); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00"); + + Map entriesByHour = parkings.stream() + .filter(m -> m.getEntryTime() != null) + .collect(Collectors.groupingBy(m -> m.getEntryTime().format(formatter), Collectors.counting())); + + Map exitsByHour = parkings.stream() + .filter(m -> m.getExitTime() != null) + .collect(Collectors.groupingBy(m -> m.getExitTime().format(formatter), Collectors.counting())); + + entriesByHour.forEach((key, value) -> + exitsByHour.merge(key, value, (v1, v2) -> v1 + v2) + ); + + return exitsByHour; + } + + public Map getSummaryOfEntriesAndExitsByEstablishment(Long establishmentId) { + List parkings = parkingService.getParkingsByEstablishment(establishmentId); + long totalEntries = parkings.stream().filter(m -> m.getEntryTime() != null).count(); + long totalExits = parkings.stream().filter(m -> m.getExitTime() != null).count(); + + return Map.of( + "totalEntries", totalEntries, + "totalExits", totalExits + ); + } + + public Map> getSummaryOfEntriesAndExitsByHourAndEstablishment(Long establishmentId) { + List parkings = parkingService.getParkingsByEstablishment(establishmentId); + + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:00"); + + Map entriesByHour = parkings.stream() + .filter(m -> m.getEntryTime() != null) + .collect(Collectors.groupingBy(m -> m.getEntryTime().format(formatter), Collectors.counting())); + + Map exitsByHour = parkings.stream() + .filter(m -> m.getExitTime() != null) + .collect(Collectors.groupingBy(m -> m.getExitTime().format(formatter), Collectors.counting())); + + entriesByHour.forEach((key, value) -> + exitsByHour.merge(key, value, (v1, v2) -> v1 + v2) + ); + + return Map.of( + "entriesByHour", entriesByHour, + "exitsByHour", exitsByHour + ); + } +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/services/VehicleService.java b/src/main/java/com/fcamara/parking/api/services/VehicleService.java new file mode 100644 index 00000000..bf71ea23 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/services/VehicleService.java @@ -0,0 +1,38 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.dto.VehiclePostDTO; +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.mappers.VehicleMapper; +import com.fcamara.parking.api.repositories.VehicleRepository; +import lombok.AllArgsConstructor; +import org.springframework.stereotype.Service; + +import java.util.List; + +@AllArgsConstructor +@Service +public class VehicleService { + private final VehicleRepository vehicleRepository; + + public Vehicle create(VehiclePostDTO vehicle) { + return vehicleRepository.save(VehicleMapper.toEntity(vehicle)); + } + + public Vehicle getById(Long id) { + return vehicleRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Veículo não encontrado")); + } + + public List getAll() { + return vehicleRepository.findAll(); + } + + public Vehicle update(Long id, VehiclePostDTO vehicle) { + vehicleRepository.findById(id).orElseThrow(() -> new ResourceNotFoundException("Veículo não encontrado")); + return vehicleRepository.save(VehicleMapper.toEntity(vehicle)); + } + + public void delete(Long id) { + vehicleRepository.deleteById(id); + } +} From 118e35f05bb84e7402513c9810cbe755e9be5346 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:41:57 -0300 Subject: [PATCH 06/18] config files --- .gitignore | 33 +++ .mvn/wrapper/maven-wrapper.properties | 19 ++ mvnw | 259 ++++++++++++++++++++++ mvnw.cmd | 149 +++++++++++++ pom.xml | 111 ++++++++++ src/main/resources/application.properties | 1 + src/main/resources/application.yml | 28 +++ 7 files changed, 600 insertions(+) create mode 100644 .gitignore create mode 100644 .mvn/wrapper/maven-wrapper.properties create mode 100644 mvnw create mode 100644 mvnw.cmd create mode 100644 pom.xml create mode 100644 src/main/resources/application.properties create mode 100644 src/main/resources/application.yml diff --git a/.gitignore b/.gitignore new file mode 100644 index 00000000..549e00a2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,33 @@ +HELP.md +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ + +### STS ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### IntelliJ IDEA ### +.idea +*.iws +*.iml +*.ipr + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 00000000..d58dfb70 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +wrapperVersion=3.3.2 +distributionType=only-script +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip diff --git a/mvnw b/mvnw new file mode 100644 index 00000000..19529ddf --- /dev/null +++ b/mvnw @@ -0,0 +1,259 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Apache Maven Wrapper startup batch script, version 3.3.2 +# +# Optional ENV vars +# ----------------- +# JAVA_HOME - location of a JDK home dir, required when download maven via java source +# MVNW_REPOURL - repo url base for downloading maven distribution +# MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +# MVNW_VERBOSE - true: enable verbose log; debug: trace the mvnw script; others: silence the output +# ---------------------------------------------------------------------------- + +set -euf +[ "${MVNW_VERBOSE-}" != debug ] || set -x + +# OS specific support. +native_path() { printf %s\\n "$1"; } +case "$(uname)" in +CYGWIN* | MINGW*) + [ -z "${JAVA_HOME-}" ] || JAVA_HOME="$(cygpath --unix "$JAVA_HOME")" + native_path() { cygpath --path --windows "$1"; } + ;; +esac + +# set JAVACMD and JAVACCMD +set_java_home() { + # For Cygwin and MinGW, ensure paths are in Unix format before anything is touched + if [ -n "${JAVA_HOME-}" ]; then + if [ -x "$JAVA_HOME/jre/sh/java" ]; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACCMD="$JAVA_HOME/jre/sh/javac" + else + JAVACMD="$JAVA_HOME/bin/java" + JAVACCMD="$JAVA_HOME/bin/javac" + + if [ ! -x "$JAVACMD" ] || [ ! -x "$JAVACCMD" ]; then + echo "The JAVA_HOME environment variable is not defined correctly, so mvnw cannot run." >&2 + echo "JAVA_HOME is set to \"$JAVA_HOME\", but \"\$JAVA_HOME/bin/java\" or \"\$JAVA_HOME/bin/javac\" does not exist." >&2 + return 1 + fi + fi + else + JAVACMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v java + )" || : + JAVACCMD="$( + 'set' +e + 'unset' -f command 2>/dev/null + 'command' -v javac + )" || : + + if [ ! -x "${JAVACMD-}" ] || [ ! -x "${JAVACCMD-}" ]; then + echo "The java/javac command does not exist in PATH nor is JAVA_HOME set, so mvnw cannot run." >&2 + return 1 + fi + fi +} + +# hash string like Java String::hashCode +hash_string() { + str="${1:-}" h=0 + while [ -n "$str" ]; do + char="${str%"${str#?}"}" + h=$(((h * 31 + $(LC_CTYPE=C printf %d "'$char")) % 4294967296)) + str="${str#?}" + done + printf %x\\n $h +} + +verbose() { :; } +[ "${MVNW_VERBOSE-}" != true ] || verbose() { printf %s\\n "${1-}"; } + +die() { + printf %s\\n "$1" >&2 + exit 1 +} + +trim() { + # MWRAPPER-139: + # Trims trailing and leading whitespace, carriage returns, tabs, and linefeeds. + # Needed for removing poorly interpreted newline sequences when running in more + # exotic environments such as mingw bash on Windows. + printf "%s" "${1}" | tr -d '[:space:]' +} + +# parse distributionUrl and optional distributionSha256Sum, requires .mvn/wrapper/maven-wrapper.properties +while IFS="=" read -r key value; do + case "${key-}" in + distributionUrl) distributionUrl=$(trim "${value-}") ;; + distributionSha256Sum) distributionSha256Sum=$(trim "${value-}") ;; + esac +done <"${0%/*}/.mvn/wrapper/maven-wrapper.properties" +[ -n "${distributionUrl-}" ] || die "cannot read distributionUrl property in ${0%/*}/.mvn/wrapper/maven-wrapper.properties" + +case "${distributionUrl##*/}" in +maven-mvnd-*bin.*) + MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ + case "${PROCESSOR_ARCHITECTURE-}${PROCESSOR_ARCHITEW6432-}:$(uname -a)" in + *AMD64:CYGWIN* | *AMD64:MINGW*) distributionPlatform=windows-amd64 ;; + :Darwin*x86_64) distributionPlatform=darwin-amd64 ;; + :Darwin*arm64) distributionPlatform=darwin-aarch64 ;; + :Linux*x86_64*) distributionPlatform=linux-amd64 ;; + *) + echo "Cannot detect native platform for mvnd on $(uname)-$(uname -m), use pure java version" >&2 + distributionPlatform=linux-amd64 + ;; + esac + distributionUrl="${distributionUrl%-bin.*}-$distributionPlatform.zip" + ;; +maven-mvnd-*) MVN_CMD=mvnd.sh _MVNW_REPO_PATTERN=/maven/mvnd/ ;; +*) MVN_CMD="mvn${0##*/mvnw}" _MVNW_REPO_PATTERN=/org/apache/maven/ ;; +esac + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +[ -z "${MVNW_REPOURL-}" ] || distributionUrl="$MVNW_REPOURL$_MVNW_REPO_PATTERN${distributionUrl#*"$_MVNW_REPO_PATTERN"}" +distributionUrlName="${distributionUrl##*/}" +distributionUrlNameMain="${distributionUrlName%.*}" +distributionUrlNameMain="${distributionUrlNameMain%-bin}" +MAVEN_USER_HOME="${MAVEN_USER_HOME:-${HOME}/.m2}" +MAVEN_HOME="${MAVEN_USER_HOME}/wrapper/dists/${distributionUrlNameMain-}/$(hash_string "$distributionUrl")" + +exec_maven() { + unset MVNW_VERBOSE MVNW_USERNAME MVNW_PASSWORD MVNW_REPOURL || : + exec "$MAVEN_HOME/bin/$MVN_CMD" "$@" || die "cannot exec $MAVEN_HOME/bin/$MVN_CMD" +} + +if [ -d "$MAVEN_HOME" ]; then + verbose "found existing MAVEN_HOME at $MAVEN_HOME" + exec_maven "$@" +fi + +case "${distributionUrl-}" in +*?-bin.zip | *?maven-mvnd-?*-?*.zip) ;; +*) die "distributionUrl is not valid, must match *-bin.zip or maven-mvnd-*.zip, but found '${distributionUrl-}'" ;; +esac + +# prepare tmp dir +if TMP_DOWNLOAD_DIR="$(mktemp -d)" && [ -d "$TMP_DOWNLOAD_DIR" ]; then + clean() { rm -rf -- "$TMP_DOWNLOAD_DIR"; } + trap clean HUP INT TERM EXIT +else + die "cannot create temp dir" +fi + +mkdir -p -- "${MAVEN_HOME%/*}" + +# Download and Install Apache Maven +verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +verbose "Downloading from: $distributionUrl" +verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +# select .zip or .tar.gz +if ! command -v unzip >/dev/null; then + distributionUrl="${distributionUrl%.zip}.tar.gz" + distributionUrlName="${distributionUrl##*/}" +fi + +# verbose opt +__MVNW_QUIET_WGET=--quiet __MVNW_QUIET_CURL=--silent __MVNW_QUIET_UNZIP=-q __MVNW_QUIET_TAR='' +[ "${MVNW_VERBOSE-}" != true ] || __MVNW_QUIET_WGET='' __MVNW_QUIET_CURL='' __MVNW_QUIET_UNZIP='' __MVNW_QUIET_TAR=v + +# normalize http auth +case "${MVNW_PASSWORD:+has-password}" in +'') MVNW_USERNAME='' MVNW_PASSWORD='' ;; +has-password) [ -n "${MVNW_USERNAME-}" ] || MVNW_USERNAME='' MVNW_PASSWORD='' ;; +esac + +if [ -z "${MVNW_USERNAME-}" ] && command -v wget >/dev/null; then + verbose "Found wget ... using wget" + wget ${__MVNW_QUIET_WGET:+"$__MVNW_QUIET_WGET"} "$distributionUrl" -O "$TMP_DOWNLOAD_DIR/$distributionUrlName" || die "wget: Failed to fetch $distributionUrl" +elif [ -z "${MVNW_USERNAME-}" ] && command -v curl >/dev/null; then + verbose "Found curl ... using curl" + curl ${__MVNW_QUIET_CURL:+"$__MVNW_QUIET_CURL"} -f -L -o "$TMP_DOWNLOAD_DIR/$distributionUrlName" "$distributionUrl" || die "curl: Failed to fetch $distributionUrl" +elif set_java_home; then + verbose "Falling back to use Java to download" + javaSource="$TMP_DOWNLOAD_DIR/Downloader.java" + targetZip="$TMP_DOWNLOAD_DIR/$distributionUrlName" + cat >"$javaSource" <<-END + public class Downloader extends java.net.Authenticator + { + protected java.net.PasswordAuthentication getPasswordAuthentication() + { + return new java.net.PasswordAuthentication( System.getenv( "MVNW_USERNAME" ), System.getenv( "MVNW_PASSWORD" ).toCharArray() ); + } + public static void main( String[] args ) throws Exception + { + setDefault( new Downloader() ); + java.nio.file.Files.copy( java.net.URI.create( args[0] ).toURL().openStream(), java.nio.file.Paths.get( args[1] ).toAbsolutePath().normalize() ); + } + } + END + # For Cygwin/MinGW, switch paths to Windows format before running javac and java + verbose " - Compiling Downloader.java ..." + "$(native_path "$JAVACCMD")" "$(native_path "$javaSource")" || die "Failed to compile Downloader.java" + verbose " - Running Downloader.java ..." + "$(native_path "$JAVACMD")" -cp "$(native_path "$TMP_DOWNLOAD_DIR")" Downloader "$distributionUrl" "$(native_path "$targetZip")" +fi + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +if [ -n "${distributionSha256Sum-}" ]; then + distributionSha256Result=false + if [ "$MVN_CMD" = mvnd.sh ]; then + echo "Checksum validation is not supported for maven-mvnd." >&2 + echo "Please disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + elif command -v sha256sum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | sha256sum -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + elif command -v shasum >/dev/null; then + if echo "$distributionSha256Sum $TMP_DOWNLOAD_DIR/$distributionUrlName" | shasum -a 256 -c >/dev/null 2>&1; then + distributionSha256Result=true + fi + else + echo "Checksum validation was requested but neither 'sha256sum' or 'shasum' are available." >&2 + echo "Please install either command, or disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." >&2 + exit 1 + fi + if [ $distributionSha256Result = false ]; then + echo "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised." >&2 + echo "If you updated your Maven version, you need to update the specified distributionSha256Sum property." >&2 + exit 1 + fi +fi + +# unzip and move +if command -v unzip >/dev/null; then + unzip ${__MVNW_QUIET_UNZIP:+"$__MVNW_QUIET_UNZIP"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -d "$TMP_DOWNLOAD_DIR" || die "failed to unzip" +else + tar xzf${__MVNW_QUIET_TAR:+"$__MVNW_QUIET_TAR"} "$TMP_DOWNLOAD_DIR/$distributionUrlName" -C "$TMP_DOWNLOAD_DIR" || die "failed to untar" +fi +printf %s\\n "$distributionUrl" >"$TMP_DOWNLOAD_DIR/$distributionUrlNameMain/mvnw.url" +mv -- "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" "$MAVEN_HOME" || [ -d "$MAVEN_HOME" ] || die "fail to move MAVEN_HOME" + +clean || : +exec_maven "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 00000000..249bdf38 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,149 @@ +<# : batch portion +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM http://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Apache Maven Wrapper startup batch script, version 3.3.2 +@REM +@REM Optional ENV vars +@REM MVNW_REPOURL - repo url base for downloading maven distribution +@REM MVNW_USERNAME/MVNW_PASSWORD - user and password for downloading maven +@REM MVNW_VERBOSE - true: enable verbose log; others: silence the output +@REM ---------------------------------------------------------------------------- + +@IF "%__MVNW_ARG0_NAME__%"=="" (SET __MVNW_ARG0_NAME__=%~nx0) +@SET __MVNW_CMD__= +@SET __MVNW_ERROR__= +@SET __MVNW_PSMODULEP_SAVE=%PSModulePath% +@SET PSModulePath= +@FOR /F "usebackq tokens=1* delims==" %%A IN (`powershell -noprofile "& {$scriptDir='%~dp0'; $script='%__MVNW_ARG0_NAME__%'; icm -ScriptBlock ([Scriptblock]::Create((Get-Content -Raw '%~f0'))) -NoNewScope}"`) DO @( + IF "%%A"=="MVN_CMD" (set __MVNW_CMD__=%%B) ELSE IF "%%B"=="" (echo %%A) ELSE (echo %%A=%%B) +) +@SET PSModulePath=%__MVNW_PSMODULEP_SAVE% +@SET __MVNW_PSMODULEP_SAVE= +@SET __MVNW_ARG0_NAME__= +@SET MVNW_USERNAME= +@SET MVNW_PASSWORD= +@IF NOT "%__MVNW_CMD__%"=="" (%__MVNW_CMD__% %*) +@echo Cannot start maven from wrapper >&2 && exit /b 1 +@GOTO :EOF +: end batch / begin powershell #> + +$ErrorActionPreference = "Stop" +if ($env:MVNW_VERBOSE -eq "true") { + $VerbosePreference = "Continue" +} + +# calculate distributionUrl, requires .mvn/wrapper/maven-wrapper.properties +$distributionUrl = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionUrl +if (!$distributionUrl) { + Write-Error "cannot read distributionUrl property in $scriptDir/.mvn/wrapper/maven-wrapper.properties" +} + +switch -wildcard -casesensitive ( $($distributionUrl -replace '^.*/','') ) { + "maven-mvnd-*" { + $USE_MVND = $true + $distributionUrl = $distributionUrl -replace '-bin\.[^.]*$',"-windows-amd64.zip" + $MVN_CMD = "mvnd.cmd" + break + } + default { + $USE_MVND = $false + $MVN_CMD = $script -replace '^mvnw','mvn' + break + } +} + +# apply MVNW_REPOURL and calculate MAVEN_HOME +# maven home pattern: ~/.m2/wrapper/dists/{apache-maven-,maven-mvnd--}/ +if ($env:MVNW_REPOURL) { + $MVNW_REPO_PATTERN = if ($USE_MVND) { "/org/apache/maven/" } else { "/maven/mvnd/" } + $distributionUrl = "$env:MVNW_REPOURL$MVNW_REPO_PATTERN$($distributionUrl -replace '^.*'+$MVNW_REPO_PATTERN,'')" +} +$distributionUrlName = $distributionUrl -replace '^.*/','' +$distributionUrlNameMain = $distributionUrlName -replace '\.[^.]*$','' -replace '-bin$','' +$MAVEN_HOME_PARENT = "$HOME/.m2/wrapper/dists/$distributionUrlNameMain" +if ($env:MAVEN_USER_HOME) { + $MAVEN_HOME_PARENT = "$env:MAVEN_USER_HOME/wrapper/dists/$distributionUrlNameMain" +} +$MAVEN_HOME_NAME = ([System.Security.Cryptography.MD5]::Create().ComputeHash([byte[]][char[]]$distributionUrl) | ForEach-Object {$_.ToString("x2")}) -join '' +$MAVEN_HOME = "$MAVEN_HOME_PARENT/$MAVEN_HOME_NAME" + +if (Test-Path -Path "$MAVEN_HOME" -PathType Container) { + Write-Verbose "found existing MAVEN_HOME at $MAVEN_HOME" + Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" + exit $? +} + +if (! $distributionUrlNameMain -or ($distributionUrlName -eq $distributionUrlNameMain)) { + Write-Error "distributionUrl is not valid, must end with *-bin.zip, but found $distributionUrl" +} + +# prepare tmp dir +$TMP_DOWNLOAD_DIR_HOLDER = New-TemporaryFile +$TMP_DOWNLOAD_DIR = New-Item -Itemtype Directory -Path "$TMP_DOWNLOAD_DIR_HOLDER.dir" +$TMP_DOWNLOAD_DIR_HOLDER.Delete() | Out-Null +trap { + if ($TMP_DOWNLOAD_DIR.Exists) { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } + } +} + +New-Item -Itemtype Directory -Path "$MAVEN_HOME_PARENT" -Force | Out-Null + +# Download and Install Apache Maven +Write-Verbose "Couldn't find MAVEN_HOME, downloading and installing it ..." +Write-Verbose "Downloading from: $distributionUrl" +Write-Verbose "Downloading to: $TMP_DOWNLOAD_DIR/$distributionUrlName" + +$webclient = New-Object System.Net.WebClient +if ($env:MVNW_USERNAME -and $env:MVNW_PASSWORD) { + $webclient.Credentials = New-Object System.Net.NetworkCredential($env:MVNW_USERNAME, $env:MVNW_PASSWORD) +} +[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12 +$webclient.DownloadFile($distributionUrl, "$TMP_DOWNLOAD_DIR/$distributionUrlName") | Out-Null + +# If specified, validate the SHA-256 sum of the Maven distribution zip file +$distributionSha256Sum = (Get-Content -Raw "$scriptDir/.mvn/wrapper/maven-wrapper.properties" | ConvertFrom-StringData).distributionSha256Sum +if ($distributionSha256Sum) { + if ($USE_MVND) { + Write-Error "Checksum validation is not supported for maven-mvnd. `nPlease disable validation by removing 'distributionSha256Sum' from your maven-wrapper.properties." + } + Import-Module $PSHOME\Modules\Microsoft.PowerShell.Utility -Function Get-FileHash + if ((Get-FileHash "$TMP_DOWNLOAD_DIR/$distributionUrlName" -Algorithm SHA256).Hash.ToLower() -ne $distributionSha256Sum) { + Write-Error "Error: Failed to validate Maven distribution SHA-256, your Maven distribution might be compromised. If you updated your Maven version, you need to update the specified distributionSha256Sum property." + } +} + +# unzip and move +Expand-Archive "$TMP_DOWNLOAD_DIR/$distributionUrlName" -DestinationPath "$TMP_DOWNLOAD_DIR" | Out-Null +Rename-Item -Path "$TMP_DOWNLOAD_DIR/$distributionUrlNameMain" -NewName $MAVEN_HOME_NAME | Out-Null +try { + Move-Item -Path "$TMP_DOWNLOAD_DIR/$MAVEN_HOME_NAME" -Destination $MAVEN_HOME_PARENT | Out-Null +} catch { + if (! (Test-Path -Path "$MAVEN_HOME" -PathType Container)) { + Write-Error "fail to move MAVEN_HOME" + } +} finally { + try { Remove-Item $TMP_DOWNLOAD_DIR -Recurse -Force | Out-Null } + catch { Write-Warning "Cannot remove $TMP_DOWNLOAD_DIR" } +} + +Write-Output "MVN_CMD=$MAVEN_HOME/bin/$MVN_CMD" diff --git a/pom.xml b/pom.xml new file mode 100644 index 00000000..67980126 --- /dev/null +++ b/pom.xml @@ -0,0 +1,111 @@ + + + 4.0.0 + + org.springframework.boot + spring-boot-starter-parent + 3.3.3 + + + com.fcamara + parking-api + 0.0.1-SNAPSHOT + parking-api + Demo project for Spring Boot + + + + + + + + + + + + + + + 17 + + + + org.springframework.boot + spring-boot-starter-web + + + org.springframework.boot + spring-boot-starter-logging + + + + + org.springframework.boot + spring-boot-starter-test + test + + + org.springframework.boot + spring-boot-starter-thymeleaf + + + org.springframework.boot + spring-boot-starter-security + + + + org.springframework.boot + spring-boot-starter-data-jpa + + + org.postgresql + postgresql + runtime + + + + org.springframework.boot + spring-boot-starter-log4j2 + + + org.springframework.boot + spring-boot-starter-validation + + + org.projectlombok + lombok + true + + + + org.springframework.boot + spring-boot-starter-test + test + + + + org.springdoc + springdoc-openapi-starter-webmvc-ui + 2.2.0 + + + + com.itextpdf + itext-core + 8.0.1 + pom + + + + + + + + org.springframework.boot + spring-boot-maven-plugin + + + + + diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties new file mode 100644 index 00000000..fbce7ac7 --- /dev/null +++ b/src/main/resources/application.properties @@ -0,0 +1 @@ +spring.application.name=vehicle-api diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml new file mode 100644 index 00000000..7665f335 --- /dev/null +++ b/src/main/resources/application.yml @@ -0,0 +1,28 @@ +server: + port: 8080 + servlet: + context-path: '/parking-api/' + +spring: + application: + name: parking-api + datasource: + url: jdbc:postgresql://localhost:5432/fcamara + username: postgres + password: postgres + jpa: + hibernate: + ddl-auto: update + dialect: org.hibernate.dialect.PostgreSQLDialect + jdbc: + lob.non-contextual-creation: true + properties: + hibernate: + show_sql: false + jackson: + time-zone: America/Sao_Paulo + +api: + security: + token: + secret: ${JWT_TOKEN:secret-key} \ No newline at end of file From f3999c726f92aac9bbd334c9306db8e3a1b554ad Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:42:20 -0300 Subject: [PATCH 07/18] controllers --- .../api/controllers/ContentController.java | 28 ++++++++ .../controllers/EstablishmentController.java | 72 +++++++++++++++++++ .../api/controllers/ParkingController.java | 49 +++++++++++++ .../api/controllers/ReportController.java | 63 ++++++++++++++++ .../api/controllers/VehicleController.java | 53 ++++++++++++++ 5 files changed, 265 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/controllers/ContentController.java create mode 100644 src/main/java/com/fcamara/parking/api/controllers/EstablishmentController.java create mode 100644 src/main/java/com/fcamara/parking/api/controllers/ParkingController.java create mode 100644 src/main/java/com/fcamara/parking/api/controllers/ReportController.java create mode 100644 src/main/java/com/fcamara/parking/api/controllers/VehicleController.java diff --git a/src/main/java/com/fcamara/parking/api/controllers/ContentController.java b/src/main/java/com/fcamara/parking/api/controllers/ContentController.java new file mode 100644 index 00000000..78c12232 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/controllers/ContentController.java @@ -0,0 +1,28 @@ +package com.fcamara.parking.api.controllers; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.GetMapping; + +@Controller +public class ContentController { + + @GetMapping("/home") + public String handleWelcome() { + return "home"; + } + + @GetMapping("/admin/home") + public String handleAdminHome() { + return "home_admin"; + } + + @GetMapping("/user/home") + public String handleUserHome() { + return "home_user"; + } + + @GetMapping("/login") + public String handleLogin() { + return "custom_login"; + } +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/controllers/EstablishmentController.java b/src/main/java/com/fcamara/parking/api/controllers/EstablishmentController.java new file mode 100644 index 00000000..965eae52 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/controllers/EstablishmentController.java @@ -0,0 +1,72 @@ +package com.fcamara.parking.api.controllers; + +import com.fcamara.parking.api.domain.dto.EstablishmentPostDTO; +import com.fcamara.parking.api.domain.entities.Establishment; +import com.fcamara.parking.api.services.EstablishmentService; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; +import io.swagger.v3.oas.annotations.Operation; +import io.swagger.v3.oas.annotations.media.Content; +import io.swagger.v3.oas.annotations.media.Schema; +import io.swagger.v3.oas.annotations.responses.ApiResponse; +import io.swagger.v3.oas.annotations.responses.ApiResponses; + +import java.util.List; + +@AllArgsConstructor +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("/establishment") +public class EstablishmentController { + private final EstablishmentService establishmentService; + + @Operation(summary = "Create a new establishment") + @ApiResponses(value = { + @ApiResponse(responseCode = "201", description = "Establishment created", + content = {@Content(mediaType = "application/json", + schema = @Schema(implementation = EstablishmentPostDTO.class))}), + @ApiResponse(responseCode = "400", description = "Invalid input", content = @Content) + }) + @PostMapping + public ResponseEntity create(@Valid @RequestBody EstablishmentPostDTO establishment) { + return ResponseEntity.ok(establishmentService.create(establishment)); + } + + @Operation(summary = "Get all establishments") + @ApiResponses(value = { + @ApiResponse(responseCode = "200", description = "Found all establishments", + content = {@Content(mediaType = "application/json", + schema = @Schema(implementation = Establishment.class))}), + @ApiResponse(responseCode = "404", description = "Establishments not found", content = @Content) + }) + @GetMapping + public ResponseEntity> getAll() { + return ResponseEntity.ok(establishmentService.getAll()); + } + + @GetMapping("/{id}") + public ResponseEntity getById(@PathVariable Long id) { + return ResponseEntity.ok(establishmentService.getById(id)); + } + + @PutMapping("/{id}") + public ResponseEntity update(@PathVariable Long id, @Valid @RequestBody EstablishmentPostDTO establishment) { + return ResponseEntity.ok(establishmentService.update(id, establishment)); + } + + @DeleteMapping("/{id}") + public ResponseEntity delete(@PathVariable Long id) { + establishmentService.delete(id); + return ResponseEntity.noContent().build(); + } +} diff --git a/src/main/java/com/fcamara/parking/api/controllers/ParkingController.java b/src/main/java/com/fcamara/parking/api/controllers/ParkingController.java new file mode 100644 index 00000000..95a046d3 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/controllers/ParkingController.java @@ -0,0 +1,49 @@ +package com.fcamara.parking.api.controllers; + +import com.fcamara.parking.api.domain.entities.Parking; +import com.fcamara.parking.api.services.ParkingService; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.List; + +@AllArgsConstructor +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("/parking") +public class ParkingController { + + private final ParkingService parkingService; + + @PostMapping("/entry") + public ResponseEntity registerEntry(@RequestParam Long vehicleId, @RequestParam Long establishmentId) { + Parking parking = parkingService.registerEntry(vehicleId, establishmentId); + return ResponseEntity.ok(parking); + } + + @PostMapping("/exit/{parkingId}") + public ResponseEntity registerExit(@PathVariable Long parkingId) { + Parking parking = parkingService.registerExit(parkingId); + return ResponseEntity.ok(parking); + } + + @GetMapping + public ResponseEntity> getAllParkings() { + List parkings = parkingService.getAll(); + return ResponseEntity.ok(parkings); + } + + @GetMapping("/vehicle/{vehicleId}") + public ResponseEntity> getParkingsByVehicle(@PathVariable Long vehicleId) { + List parkings = parkingService.getParkingsByVehicle(vehicleId); + return ResponseEntity.ok(parkings); + } + + @GetMapping("/establishment/{establishmentId}") + public ResponseEntity> getParkingsByEstablishment(@PathVariable Long establishmentId) { + List parkings = parkingService.getParkingsByEstablishment(establishmentId); + return ResponseEntity.ok(parkings); + } + +} diff --git a/src/main/java/com/fcamara/parking/api/controllers/ReportController.java b/src/main/java/com/fcamara/parking/api/controllers/ReportController.java new file mode 100644 index 00000000..611f0103 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/controllers/ReportController.java @@ -0,0 +1,63 @@ +package com.fcamara.parking.api.controllers; + +import com.fcamara.parking.api.services.ReportParkingService; +import lombok.AllArgsConstructor; +import org.springframework.core.io.InputStreamResource; +import org.springframework.http.HttpHeaders; +import org.springframework.http.HttpStatus; +import org.springframework.http.MediaType; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.*; + +import java.util.Map; + +@RestController +@RequestMapping("/reports") +@CrossOrigin(origins = "*", maxAge = 3600) +@AllArgsConstructor +public class ReportController { + + private final ReportParkingService reportParkingService; + + @GetMapping("/parking/{establishmentId}") + public ResponseEntity exportParkingPdfReport(@PathVariable(value = "establishmentId") Long establishmentId, + @RequestParam(value = "dateTimeInitial", required = false) String dateTimeInitial, + @RequestParam(value = "dateTimeFinal", required = false) String dateTimeFinal) { + + try { + InputStreamResource resource = reportParkingService.report(establishmentId, dateTimeInitial, dateTimeFinal); + + return ResponseEntity.ok() + .header(HttpHeaders.CONTENT_DISPOSITION, "attachment; filename=\"parking_report.pdf\"") + .contentType(MediaType.APPLICATION_PDF) + .body(resource); + } catch (IllegalArgumentException e) { + return ResponseEntity.status(HttpStatus.NOT_FOUND).body(e.getMessage()); + } + } + + + @GetMapping("/parking/summary") + public ResponseEntity> getSummaryOfEntriesAndExits() { + Map summary = reportParkingService.getSummaryOfEntriesAndExits(); + return ResponseEntity.ok(summary); + } + + @GetMapping("/parking/summary-by-hour") + public ResponseEntity> getSummaryOfEntriesAndExitsByHour() { + Map summaryByHour = reportParkingService.getSummaryOfEntriesAndExitsByHour(); + return ResponseEntity.ok(summaryByHour); + } + + @GetMapping("/parking/summary/establishment/{establishmentId}") + public ResponseEntity> getSummaryByEstablishment(@PathVariable Long establishmentId) { + Map summary = reportParkingService.getSummaryOfEntriesAndExitsByEstablishment(establishmentId); + return ResponseEntity.ok(summary); + } + + @GetMapping("/parking/summary-by-hour/establishment/{establishmentId}") + public ResponseEntity>> getSummaryByHourAndEstablishment(@PathVariable Long establishmentId) { + Map> summaryByHour = reportParkingService.getSummaryOfEntriesAndExitsByHourAndEstablishment(establishmentId); + return ResponseEntity.ok(summaryByHour); + } +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/controllers/VehicleController.java b/src/main/java/com/fcamara/parking/api/controllers/VehicleController.java new file mode 100644 index 00000000..6e2f6663 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/controllers/VehicleController.java @@ -0,0 +1,53 @@ +package com.fcamara.parking.api.controllers; + +import com.fcamara.parking.api.domain.dto.VehiclePostDTO; +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.services.VehicleService; +import jakarta.validation.Valid; +import lombok.AllArgsConstructor; +import org.springframework.http.ResponseEntity; +import org.springframework.web.bind.annotation.CrossOrigin; +import org.springframework.web.bind.annotation.DeleteMapping; +import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; +import org.springframework.web.bind.annotation.PutMapping; +import org.springframework.web.bind.annotation.RequestBody; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.bind.annotation.RestController; + +import java.util.List; + +@AllArgsConstructor +@CrossOrigin(origins = "*", maxAge = 3600) +@RestController +@RequestMapping("/vehicles") +public class VehicleController { + private final VehicleService vehicleService; + + @GetMapping("/{id}") + public ResponseEntity getVehicleById(@PathVariable Long id) { + return ResponseEntity.ok(vehicleService.getById(id)); + } + + @GetMapping + public ResponseEntity> getAllVehicles() { + return ResponseEntity.ok(vehicleService.getAll()); + } + + @PostMapping + public ResponseEntity createVehicle(@Valid @RequestBody VehiclePostDTO vehicle) { + return ResponseEntity.ok(vehicleService.create(vehicle)); + } + + @PutMapping("/{id}") + public ResponseEntity updateVehicle(@PathVariable Long id, @Valid @RequestBody VehiclePostDTO vehicle) { + return ResponseEntity.ok(vehicleService.update(id, vehicle)); + } + + @DeleteMapping("/{id}") + public ResponseEntity deleteVehicle(@PathVariable Long id) { + vehicleService.delete(id); + return ResponseEntity.noContent().build(); + } +} From bbf2348246dbb4a68c188bd6682897d04a9ed5e0 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:42:34 -0300 Subject: [PATCH 08/18] unit tests --- .../api/VehicleApiApplicationTests.java | 13 ++ .../services/EstablishmentServiceTest.java | 137 ++++++++++++++++ .../api/services/ParkingServiceTest.java | 148 ++++++++++++++++++ .../api/services/VehicleServiceTest.java | 136 ++++++++++++++++ 4 files changed, 434 insertions(+) create mode 100644 src/test/java/com/fcamara/parking/api/VehicleApiApplicationTests.java create mode 100644 src/test/java/com/fcamara/parking/api/services/EstablishmentServiceTest.java create mode 100644 src/test/java/com/fcamara/parking/api/services/ParkingServiceTest.java create mode 100644 src/test/java/com/fcamara/parking/api/services/VehicleServiceTest.java diff --git a/src/test/java/com/fcamara/parking/api/VehicleApiApplicationTests.java b/src/test/java/com/fcamara/parking/api/VehicleApiApplicationTests.java new file mode 100644 index 00000000..6db16b06 --- /dev/null +++ b/src/test/java/com/fcamara/parking/api/VehicleApiApplicationTests.java @@ -0,0 +1,13 @@ +package com.fcamara.parking.api; + +import org.junit.jupiter.api.Test; +import org.springframework.boot.test.context.SpringBootTest; + +@SpringBootTest +class VehicleApiApplicationTests { + + @Test + void contextLoads() { + } + +} diff --git a/src/test/java/com/fcamara/parking/api/services/EstablishmentServiceTest.java b/src/test/java/com/fcamara/parking/api/services/EstablishmentServiceTest.java new file mode 100644 index 00000000..87867d6c --- /dev/null +++ b/src/test/java/com/fcamara/parking/api/services/EstablishmentServiceTest.java @@ -0,0 +1,137 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.dto.EstablishmentPostDTO; +import com.fcamara.parking.api.domain.entities.Establishment; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.repositories.EstablishmentRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentCaptor.forClass; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class EstablishmentServiceTest { + + @InjectMocks EstablishmentService establishmentService; + @Mock + EstablishmentRepository establishmentRepository; + + @Test + void shouldCreateEstablishmentWithSuccess() { + Establishment establishment = getMock(); + + var establishmentPostDTO = new EstablishmentPostDTO(); + BeanUtils.copyProperties(establishment, establishmentPostDTO); + + when(establishmentRepository.save(any(Establishment.class))).thenReturn(establishment); + + Establishment savedEstablishment = establishmentService.create(establishmentPostDTO); + + ArgumentCaptor establishmentCaptor = forClass(Establishment.class); + verify(establishmentRepository).save(establishmentCaptor.capture()); + + Establishment capturedEstablishment = establishmentCaptor.getValue(); + + assertAll( + () -> assertEquals("ESTACIONAMENTO CENTRAL", capturedEstablishment.getName()), + () -> assertEquals("17465589000104", capturedEstablishment.getCnpj()), + () -> assertEquals("(85) 1111-2222", capturedEstablishment.getPhone()), + () -> assertEquals(25, capturedEstablishment.getCarSpots()), + () -> assertEquals(20, capturedEstablishment.getMotorcycleSpots()), + () -> assertNotNull(capturedEstablishment.getAddress()), + () -> assertNotNull(savedEstablishment) + ); + } + + @Test + void shouldFindAllEstablishmentWithSuccess() { + Establishment establishment = getMock(); + + when(establishmentRepository.findAll()).thenReturn(List.of(establishment)); + + List foundEstablishmentList = establishmentService.getAll(); + + assertFalse(foundEstablishmentList.isEmpty()); + assertEquals(1, foundEstablishmentList.size()); + } + + + @Test + void shouldFindEstablishmentByIdWithSuccess() { + Long establishmentId = 1L; + Establishment establishment = getMock(); + establishment.setId(establishmentId); + + when(establishmentRepository.findById(1L)).thenReturn(Optional.of(establishment)); + + Establishment foundEstablishment = establishmentService.getById(establishmentId); + + assertNotNull(foundEstablishment); + assertEquals(establishment, foundEstablishment); + } + + @Test + public void shouldThrowsExceptionWhenEstablishmentIdNotExist() { + Long establishmentId = 1L; + + when(establishmentRepository.findById(establishmentId)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> { + establishmentService.getById(establishmentId); + }); + } + + @Test + public void shouldDeleteEstablishmentWithSuccess() { + Long establishmentId = 1L; + + establishmentService.delete(establishmentId); + + verify(establishmentRepository, times(1)).deleteById(establishmentId); + } + + @Test + public void shouldUpdateSuccessful() { + Long establishmentId = 1L; + String newName = "ESTACIONAMENTO CENTRO"; + Establishment establishmentDatabase = getMock(); + establishmentDatabase.setId(establishmentId); + + Establishment establishmentUpdated = getMock(); + establishmentUpdated.setId(establishmentId); + establishmentUpdated.setName(newName); + + var establishmentPostDTO = new EstablishmentPostDTO(); + BeanUtils.copyProperties(establishmentDatabase, establishmentPostDTO); + + when(establishmentRepository.findById(1L)).thenReturn(Optional.of(establishmentDatabase)); + when(establishmentRepository.save(any(Establishment.class))).thenReturn(establishmentUpdated); + + Establishment updatedEstablishment = establishmentService.update(1L, establishmentPostDTO); + + assertNotNull(updatedEstablishment); + assertEquals(newName, updatedEstablishment.getName()); + } + + private Establishment getMock(){ + return Establishment.builder() + .name("ESTACIONAMENTO CENTRAL") + .cnpj("17465589000104") + .phone("(85) 1111-2222") + .address("AV. SANTOS DUMONT, N. 1111") + .carSpots(25) + .motorcycleSpots(20) + .build(); + } +} diff --git a/src/test/java/com/fcamara/parking/api/services/ParkingServiceTest.java b/src/test/java/com/fcamara/parking/api/services/ParkingServiceTest.java new file mode 100644 index 00000000..e0d1fc25 --- /dev/null +++ b/src/test/java/com/fcamara/parking/api/services/ParkingServiceTest.java @@ -0,0 +1,148 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.entities.Establishment; +import com.fcamara.parking.api.domain.entities.Parking; +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.domain.enums.VehicleType; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.repositories.ParkingRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; + +import java.time.LocalDateTime; +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class ParkingServiceTest { + + @InjectMocks + ParkingService parkingService; + @Mock + ParkingRepository parkingRepository; + @Mock VehicleService vehicleService; + @Mock EstablishmentService establishmentService; + + @Test + public void shouldRegisterEntrySuccess() { + // Arrange + Long vehicleId = 1L; + Long establishmentId = 1L; + Vehicle vehicle = getVehicleMock(); + Establishment establishment = getEstablishmentMock(); + Parking expectedParking = Parking.builder() + .vehicle(vehicle) + .establishment(establishment) + .entryTime(LocalDateTime.now()) + .build(); + + when(vehicleService.getById(vehicleId)).thenReturn(vehicle); + when(establishmentService.getById(establishmentId)).thenReturn(establishment); + when(parkingRepository.save(any(Parking.class))).thenReturn(expectedParking); + + // Act + Parking actualParking = parkingService.registerEntry(vehicleId, establishmentId); + + // Assert + assertNotNull(actualParking); + assertEquals(expectedParking.getVehicle(), actualParking.getVehicle()); + assertEquals(expectedParking.getEstablishment(), actualParking.getEstablishment()); + verify(parkingRepository, times(1)).save(any(Parking.class)); + } + + @Test + public void shouldUpdatesExitTimeSuccessfully() { + Parking parking = Parking.builder().id(1L).entryTime(LocalDateTime.now()).build(); + + when(parkingRepository.findById(1L)).thenReturn(Optional.of(parking)); + when(parkingRepository.save(any(Parking.class))).thenReturn(parking); + + Parking updatedParking = parkingService.registerExit(1L); + + assertNotNull(updatedParking.getExitTime()); + verify(parkingRepository).save(parking); + } + + @Test + public void shouldFailWhenParkingRecordNotFound() { + when(parkingRepository.findById(1L)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> parkingService.registerExit(1L)); + } + + @Test + void shouldFindAllVehicleWithSuccess() { + Parking parking = getMock(); + + when(parkingRepository.findAll()).thenReturn(List.of(parking)); + + List foundParkingList = parkingService.getAll(); + + assertFalse(foundParkingList.isEmpty()); + assertEquals(1, foundParkingList.size()); + } + + @Test + void shouldFindByVehicleIdWithSuccess() { + Long vehicleId = 1L; + Parking parking = getMock(); + + when(parkingRepository.findByVehicleId(1L)).thenReturn(List.of(parking)); + + List foundParkingList = parkingService.getParkingsByVehicle(vehicleId); + + assertFalse(foundParkingList.isEmpty()); + assertEquals(1, foundParkingList.size()); + } + + @Test + void shouldFindByEstablishmentIdWithSuccess() { + Long establishmentId = 1L; + Parking parking = getMock(); + + when(parkingRepository.findByEstablishmentId(1L)).thenReturn(List.of(parking)); + + List foundParkingList = parkingService.getParkingsByEstablishment(establishmentId); + + assertFalse(foundParkingList.isEmpty()); + assertEquals(1, foundParkingList.size()); + } + + private Parking getMock(){ + return Parking.builder() + .vehicle(getVehicleMock()) + .establishment(getEstablishmentMock()) + .entryTime(LocalDateTime.now()) + .build(); + } + + private Establishment getEstablishmentMock(){ + return Establishment.builder() + .id(1L) + .name("ESTACIONAMENTO CENTRAL") + .cnpj("17465589000104") + .phone("(85) 1111-2222") + .address("AV. SANTOS DUMONT, N. 1111") + .carSpots(25) + .motorcycleSpots(20) + .build(); + } + + private Vehicle getVehicleMock(){ + return Vehicle.builder() + .id(1L) + .brand("FIAT") + .model("UNO") + .color("PRETO") + .licensePlate("XXX1111") + .type(VehicleType.CAR) + .build(); + } +} diff --git a/src/test/java/com/fcamara/parking/api/services/VehicleServiceTest.java b/src/test/java/com/fcamara/parking/api/services/VehicleServiceTest.java new file mode 100644 index 00000000..0de365e4 --- /dev/null +++ b/src/test/java/com/fcamara/parking/api/services/VehicleServiceTest.java @@ -0,0 +1,136 @@ +package com.fcamara.parking.api.services; + +import com.fcamara.parking.api.domain.dto.VehiclePostDTO; +import com.fcamara.parking.api.domain.entities.Vehicle; +import com.fcamara.parking.api.domain.enums.VehicleType; +import com.fcamara.parking.api.exceptions.ResourceNotFoundException; +import com.fcamara.parking.api.repositories.VehicleRepository; +import org.junit.jupiter.api.Test; +import org.junit.jupiter.api.extension.ExtendWith; +import org.mockito.ArgumentCaptor; +import org.mockito.InjectMocks; +import org.mockito.Mock; +import org.mockito.junit.jupiter.MockitoExtension; +import org.springframework.beans.BeanUtils; + +import java.util.List; +import java.util.Optional; + +import static org.junit.jupiter.api.Assertions.*; +import static org.mockito.ArgumentCaptor.forClass; +import static org.mockito.ArgumentMatchers.any; +import static org.mockito.Mockito.*; + +@ExtendWith(MockitoExtension.class) +public class VehicleServiceTest { + + @InjectMocks VehicleService vehicleService; + @Mock + VehicleRepository vehicleRepository; + + @Test + void shouldCreateVehicleWithSuccess() { + Vehicle vehicle = getMock(); + + var vehiclePostDTO = new VehiclePostDTO(); + BeanUtils.copyProperties(vehicle, vehiclePostDTO); + + when(vehicleRepository.save(any(Vehicle.class))).thenReturn(vehicle); + + Vehicle savedVehicle = vehicleService.create(vehiclePostDTO); + + ArgumentCaptor vehicleCaptor = forClass(Vehicle.class); + verify(vehicleRepository).save(vehicleCaptor.capture()); + + Vehicle capturedVehicle = vehicleCaptor.getValue(); + + assertAll( + () -> assertEquals("FIAT", capturedVehicle.getBrand()), + () -> assertEquals("UNO", capturedVehicle.getModel()), + () -> assertEquals("PRETO", capturedVehicle.getColor()), + () -> assertEquals("XXX1111", capturedVehicle.getLicensePlate()), + () -> assertEquals(VehicleType.CAR, capturedVehicle.getType()), + () -> assertNotNull(savedVehicle) + ); + } + + @Test + void shouldFindAllVehicleWithSuccess() { + Vehicle vehicle = getMock(); + + when(vehicleRepository.findAll()).thenReturn(List.of(vehicle)); + + List foundVehicleList = vehicleService.getAll(); + + assertFalse(foundVehicleList.isEmpty()); + assertEquals(1, foundVehicleList.size()); + } + + @Test + void shouldFindVehicleByIdWithSuccess() { + Long vehicleId = 1L; + Vehicle vehicle = getMock(); + vehicle.setId(vehicleId); + + when(vehicleRepository.findById(1L)).thenReturn(Optional.of(vehicle)); + + Vehicle foundVehicle = vehicleService.getById(vehicleId); + + assertNotNull(foundVehicle); + assertEquals(vehicle, foundVehicle); + } + + @Test + public void shouldThrowsExceptionWhenVehicleIdNotExist() { + Long vehicleId = 1L; + + when(vehicleRepository.findById(vehicleId)).thenReturn(Optional.empty()); + + assertThrows(ResourceNotFoundException.class, () -> { + vehicleService.getById(vehicleId); + }); + } + + @Test + public void shouldDeleteVehicleWithSuccess() { + Long vehicleId = 1L; + + vehicleService.delete(vehicleId); + + verify(vehicleRepository, times(1)).deleteById(vehicleId); + } + + @Test + public void shouldUpdateSuccessful() { + Long vehicleId = 1L; + String newModelName = "UNO MILE"; + Vehicle vehicleDatabase = getMock(); + vehicleDatabase.setId(vehicleId); + + Vehicle vehicleUpdated = getMock(); + vehicleUpdated.setId(vehicleId); + vehicleUpdated.setModel(newModelName); + + var vehiclePostDTO = new VehiclePostDTO(); + BeanUtils.copyProperties(vehicleDatabase, vehiclePostDTO); + + when(vehicleRepository.findById(1L)).thenReturn(Optional.of(vehicleDatabase)); + when(vehicleRepository.save(any(Vehicle.class))).thenReturn(vehicleUpdated); + + Vehicle updatedVehicle = vehicleService.update(1L, vehiclePostDTO); + + assertNotNull(updatedVehicle); + assertEquals(newModelName, updatedVehicle.getModel()); + } + + private Vehicle getMock(){ + return Vehicle.builder() + .brand("FIAT") + .model("UNO") + .color("PRETO") + .licensePlate("XXX1111") + .type(VehicleType.CAR) + .build(); + } +} + From 24d1ae77e7cf0110933d2768f99b697193294043 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:42:52 -0300 Subject: [PATCH 09/18] treat exception --- .../exceptions/GlobalExceptionHandler.java | 38 +++++++++++++++++++ 1 file changed, 38 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/exceptions/GlobalExceptionHandler.java diff --git a/src/main/java/com/fcamara/parking/api/exceptions/GlobalExceptionHandler.java b/src/main/java/com/fcamara/parking/api/exceptions/GlobalExceptionHandler.java new file mode 100644 index 00000000..c1fdc19c --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/exceptions/GlobalExceptionHandler.java @@ -0,0 +1,38 @@ +package com.fcamara.parking.api.exceptions; + +import org.springframework.http.HttpStatus; +import org.springframework.http.ResponseEntity; +import org.springframework.validation.FieldError; +import org.springframework.web.bind.MethodArgumentNotValidException; +import org.springframework.web.bind.annotation.ControllerAdvice; +import org.springframework.web.bind.annotation.ExceptionHandler; +import org.springframework.web.bind.annotation.ResponseStatus; + +import java.util.HashMap; +import java.util.Map; + +@ControllerAdvice +public class GlobalExceptionHandler { + + @ExceptionHandler(MethodArgumentNotValidException.class) + @ResponseStatus(HttpStatus.BAD_REQUEST) + public ResponseEntity> handleValidationExceptions(MethodArgumentNotValidException ex) { + Map errors = new HashMap<>(); + + ex.getBindingResult().getAllErrors().forEach((error) -> { + String fieldName = ((FieldError) error).getField(); + String errorMessage = error.getDefaultMessage(); + errors.put(fieldName, errorMessage); + }); + + return new ResponseEntity<>(errors, HttpStatus.BAD_REQUEST); + } + + @ExceptionHandler(ResourceNotFoundException.class) + @ResponseStatus(HttpStatus.NOT_FOUND) + public ResponseEntity> handleResourceNotFoundException(ResourceNotFoundException ex) { + Map error = new HashMap<>(); + error.put("error", ex.getMessage()); + return new ResponseEntity<>(error, HttpStatus.NOT_FOUND); + } +} From 61227ca94c8e796f7b629d2254c4aa62bf9c73ae Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:43:01 -0300 Subject: [PATCH 10/18] custom pages --- .../resources/templates/custom_login.html | 73 +++++++++++++++++++ src/main/resources/templates/home.html | 60 +++++++++++++++ src/main/resources/templates/home_admin.html | 47 ++++++++++++ src/main/resources/templates/home_user.html | 47 ++++++++++++ 4 files changed, 227 insertions(+) create mode 100644 src/main/resources/templates/custom_login.html create mode 100644 src/main/resources/templates/home.html create mode 100644 src/main/resources/templates/home_admin.html create mode 100644 src/main/resources/templates/home_user.html diff --git a/src/main/resources/templates/custom_login.html b/src/main/resources/templates/custom_login.html new file mode 100644 index 00000000..68a926c9 --- /dev/null +++ b/src/main/resources/templates/custom_login.html @@ -0,0 +1,73 @@ + + + + + + Login + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/home.html b/src/main/resources/templates/home.html new file mode 100644 index 00000000..21593350 --- /dev/null +++ b/src/main/resources/templates/home.html @@ -0,0 +1,60 @@ + + + + + + Spring Boot Security Tutorial + + + +
+

Spring Boot Security Tutorial

+

Welcome to the open section of the tutorial. Explore and learn about Spring Boot Security.

+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/home_admin.html b/src/main/resources/templates/home_admin.html new file mode 100644 index 00000000..54be9445 --- /dev/null +++ b/src/main/resources/templates/home_admin.html @@ -0,0 +1,47 @@ + + + + + + Admin Home - Spring Boot Security Tutorial + + + +
+

Welcome, Admin!

+

This is the admin home page. Explore and manage your admin functionalities.

+
+ + \ No newline at end of file diff --git a/src/main/resources/templates/home_user.html b/src/main/resources/templates/home_user.html new file mode 100644 index 00000000..afc0e1bd --- /dev/null +++ b/src/main/resources/templates/home_user.html @@ -0,0 +1,47 @@ + + + + + + User Home - Spring Boot Security Tutorial + + + +
+

Welcome, User!

+

This is the user home page. Explore and access your user-specific features.

+
+ + \ No newline at end of file From 49cd1cb8517f18c34e2db161c3016c4808134882 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:43:20 -0300 Subject: [PATCH 11/18] utils --- .../parking/api/config/DateConfig.java | 15 ++++++++++ .../fcamara/parking/api/utils/DateUtil.java | 30 +++++++++++++++++++ 2 files changed, 45 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/config/DateConfig.java create mode 100644 src/main/java/com/fcamara/parking/api/utils/DateUtil.java diff --git a/src/main/java/com/fcamara/parking/api/config/DateConfig.java b/src/main/java/com/fcamara/parking/api/config/DateConfig.java new file mode 100644 index 00000000..81848701 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/config/DateConfig.java @@ -0,0 +1,15 @@ +package com.fcamara.parking.api.config; + +import com.fasterxml.jackson.databind.ObjectMapper; +import org.springframework.context.annotation.Bean; + +import java.util.TimeZone; + +public class DateConfig { + @Bean + public ObjectMapper objectMapper() { + ObjectMapper objectMapper = new ObjectMapper(); + objectMapper.setTimeZone(TimeZone.getTimeZone("America/Sao_Paulo")); + return objectMapper; + } +} \ No newline at end of file diff --git a/src/main/java/com/fcamara/parking/api/utils/DateUtil.java b/src/main/java/com/fcamara/parking/api/utils/DateUtil.java new file mode 100644 index 00000000..5814eef3 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/utils/DateUtil.java @@ -0,0 +1,30 @@ +package com.fcamara.parking.api.utils; + +import lombok.experimental.UtilityClass; +import lombok.extern.slf4j.Slf4j; + +import java.time.LocalDateTime; +import java.time.format.DateTimeFormatter; +import java.time.format.DateTimeParseException; + +@UtilityClass +@Slf4j +public class DateUtil { + public static String formatDate(LocalDateTime date, String pattern) { + try { + String formattedDateString = null; + + DateTimeFormatter dateTimeformatter = DateTimeFormatter.ofPattern(pattern); + formattedDateString = date.format(dateTimeformatter); + + return formattedDateString; + } catch (DateTimeParseException e) { + return date.toString(); + } + } + + public static LocalDateTime convertToLocalDateTime(String date) { + DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd'T'HH:mm:ss"); + return LocalDateTime.parse(date, formatter); + } +} \ No newline at end of file From d265dce07c00205513e11d653a6109403583e485 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:43:30 -0300 Subject: [PATCH 12/18] swagger config --- .../parking/api/config/OpenApiConfig.java | 27 +++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/config/OpenApiConfig.java diff --git a/src/main/java/com/fcamara/parking/api/config/OpenApiConfig.java b/src/main/java/com/fcamara/parking/api/config/OpenApiConfig.java new file mode 100644 index 00000000..55d3b603 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/config/OpenApiConfig.java @@ -0,0 +1,27 @@ +package com.fcamara.parking.api.config; + +import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.info.Info; +import io.swagger.v3.oas.models.info.Contact; +import io.swagger.v3.oas.models.security.SecurityRequirement; +import io.swagger.v3.oas.models.security.SecurityScheme; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; + +@Configuration +public class OpenApiConfig { + + @Bean + public OpenAPI customOpenAPI() { + return new OpenAPI() + .addSecurityItem(new SecurityRequirement().addList("basicAuth")) + .components(new io.swagger.v3.oas.models.Components() + .addSecuritySchemes("basicAuth", + new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("basic"))) + .info(new Info() + .title("Parking Management API") + .version("1.0") + .description("API for managing a parking lot for cars and motorcycles") + .contact(new Contact().name("Pedro Lucas").email("youremail@example.com"))); + } +} From 469e8490321196607b8fb4dce7f015ddaa2df694 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:43:43 -0300 Subject: [PATCH 13/18] exception not found --- .../parking/api/exceptions/ResourceNotFoundException.java | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/exceptions/ResourceNotFoundException.java diff --git a/src/main/java/com/fcamara/parking/api/exceptions/ResourceNotFoundException.java b/src/main/java/com/fcamara/parking/api/exceptions/ResourceNotFoundException.java new file mode 100644 index 00000000..2435eb9a --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/exceptions/ResourceNotFoundException.java @@ -0,0 +1,8 @@ +package com.fcamara.parking.api.exceptions; + +public class ResourceNotFoundException extends RuntimeException { + + public ResourceNotFoundException(String message) { + super(message); + } +} From fcf8c2d9455f9b2a860169ad839ab2d1af3d2fd1 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:43:55 -0300 Subject: [PATCH 14/18] spring security config --- .../api/config/security/SecurityConfig.java | 52 +++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/config/security/SecurityConfig.java diff --git a/src/main/java/com/fcamara/parking/api/config/security/SecurityConfig.java b/src/main/java/com/fcamara/parking/api/config/security/SecurityConfig.java new file mode 100644 index 00000000..52005b2c --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/config/security/SecurityConfig.java @@ -0,0 +1,52 @@ +package com.fcamara.parking.api.config.security; + +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.Configuration; +import org.springframework.security.config.annotation.web.builders.HttpSecurity; +import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity; +import org.springframework.security.config.annotation.web.configurers.AbstractAuthenticationFilterConfigurer; +import org.springframework.security.core.userdetails.User; +import org.springframework.security.core.userdetails.UserDetails; +import org.springframework.security.core.userdetails.UserDetailsService; +import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder; +import org.springframework.security.crypto.password.PasswordEncoder; +import org.springframework.security.provisioning.InMemoryUserDetailsManager; +import org.springframework.security.web.SecurityFilterChain; + +@Configuration +@EnableWebSecurity +public class SecurityConfig { + + @Bean + public SecurityFilterChain securityFilterChain(HttpSecurity httpSecurity) throws Exception { + return httpSecurity + .authorizeHttpRequests(registry -> { + registry.requestMatchers("/home").permitAll(); + registry.requestMatchers("/parking/**").hasRole("ADMIN"); + registry.requestMatchers("/vehicles/**", "/establishment/**").hasRole("USER"); + registry.anyRequest().authenticated(); + }) + .formLogin(AbstractAuthenticationFilterConfigurer::permitAll) + .build(); + } + + @Bean + public UserDetailsService userDetailsService() { + UserDetails normalUser = User.builder() + .username("pedro.lucas") + .password("$2a$12$pLlEDlW7J3LJMLMl0Uv8Xu.NO1TYDvrMmIpoDhpHZ3So65XlsR.Vy") + .roles("USER") + .build(); + UserDetails adminUser = User.builder() + .username("admin") + .password("$2a$12$4MVGfzHJ2C370at3MTGHdeX6z/kon2X5KbVWZTGfqjWBhj.KnQBuC") + .roles("ADMIN", "USER") + .build(); + return new InMemoryUserDetailsManager(normalUser, adminUser); + } + + @Bean + public PasswordEncoder passwordEncoder() { + return new BCryptPasswordEncoder(); + } +} \ No newline at end of file From 6fe29821b38ecf809cd6ce93ee87b15d72fb3092 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:44:04 -0300 Subject: [PATCH 15/18] application --- .../parking/api/ParkingApiApplication.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) create mode 100644 src/main/java/com/fcamara/parking/api/ParkingApiApplication.java diff --git a/src/main/java/com/fcamara/parking/api/ParkingApiApplication.java b/src/main/java/com/fcamara/parking/api/ParkingApiApplication.java new file mode 100644 index 00000000..20a5a159 --- /dev/null +++ b/src/main/java/com/fcamara/parking/api/ParkingApiApplication.java @@ -0,0 +1,16 @@ +package com.fcamara.parking.api; + +import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.SpringBootApplication; + +import java.util.TimeZone; + +@SpringBootApplication +public class ParkingApiApplication { + + public static void main(String[] args) { + TimeZone.setDefault(TimeZone.getTimeZone("America/Sao_Paulo")); + SpringApplication.run(ParkingApiApplication.class, args); + } + +} From df85fee3fbc3e2bc392257b9bba952efdc114348 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:44:11 -0300 Subject: [PATCH 16/18] readm --- README.md | 311 +++++++++++++++++++++++++++++++++++++++++------------- 1 file changed, 238 insertions(+), 73 deletions(-) diff --git a/README.md b/README.md index d45458df..e6b5ef23 100644 --- a/README.md +++ b/README.md @@ -1,79 +1,244 @@ -### FCamara 🚀 +## Projeto Spring Boot - Sistema de Gestão de Estacionamento +API REST para gerecenciamento de estacionamento de veículos (carros e motos), com funcionalidades de cadastro de estabelecimentos, veículos e controle de entrada e saída. +Também foi adicionada funcionalidades de autenticação básica do Spring Security e geração de relatório básico em PDF, com detalhes e sumário de entrada e saída de veículos. -*"Queremos ser como uma árvore, crescer um pouco todos os dias e tentar tocar o céu, sem perder a solidez de nossas raízes."* -Conheça: www.fcamara.com.br +## Tecnologias Utilizadas +- Java 17 +- Spring Boot 3.3.3 + - Spring Data JPA + - Spring Validation + - Spring Web + - Spring Security +- Postgres +- Lombok +- IText para geração de PDFs. -## Teste para vaga de Desenvolvedor Back-end -Criar uma API REST para gerenciar um estacionamento de carros e motos. +## Endpoints da API +## Autenticação +http://localhost:8080/parking-api/login +user comum: pedro.lucas +password: 1234 +user admin: admin +password: 9876 -## Cadastro de estabelecimento -Criar um cadastro da empresa com os seguintes campos: - - Nome; - - CNPJ; - - Endereço; - - Telefone; - - Quantidade de vagas para motos; - - Quantidade de vagas para carros. +## Swagger +http://localhost:8080/vehicle-api/swagger-ui/index.html + +## Listar Estabelecimentos +`GET /establishments` +Retorna todos os estabelecimentos cadastrados caso não passe nenhum parametro no @RequestParam + +`GET /establishments/1` +Retorna o estabelecimento por id + + +`GET /establishments/cnpj/40245027000169` +Retorna o estabelecimento por cnpj + + `curl --location 'http://localhost:8080/establishments/cnpj/40245027000169' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + + +## Atualiza Estabelecimento + +`PUT 'http://localhost:8080/establishments/9e5f5223-ead1-4a7f-9bce-2dbd0ad63b13` + + `curl --location --request PUT 'http://localhost:8080/establishments/9e5f5223-ead1-4a7f-9bce-2dbd0ad63b13' \ + --header 'Content-Type: application/json' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ + --data '{ + "name": "ESTACIONAMENTO DO FALCAO", + "cnpj": "40245027000169", + "address": { + "street": "RUA CORONEL JOAO CORDEIRO", + "number": "67", + "city": "CAPITAL DO CEARÁ" + }, + "phone": "85998654679", + "numberCarSpaces": 10, + "numberMotorcycleSpaces": 10 + }'` + + +## Deleta Estabelecimento + `DELETE 'http://localhost:8080/establishments/3de98d93-c14e-4004-9842-a5844103578c` + + + `curl --location --request DELETE 'http://localhost:8080/establishments/3de98d93-c14e-4004-9842-a5844103578c' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNzY2Nn0.udu8g7KpZzlxWglGVpvVXsLIEbwg02NjxvlKaAko0bI' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + +* Alterar token da request passando o token gerado no `POST /auth/login` -**Todos** os campos são de preenchimento obrigatório. ## Cadastro de veículos -Criar um cadastro de veículos com os seguintes campos: - - Marca; - - Modelo; - - Cor; - - Placa; - - Tipo. - -**Todos** os campos são de preenchimento obrigatório. - -## Funcionalidades - - **Estabelecimento:** CRUD; - - **Veículos:** CRUD; - - **Controle de entrada e saída de veículos.** - -## Requisitos - - Modelagem de dados; - - O retorno deverá ser em formato JSON e XML; - - Requisições GET, POST, PUT ou DELETE, conforme a melhor prática; - - A persistência dos dados pode ser realizada da maneira que preferir; - - Criar README do projeto descrevendo as tecnologias utilizadas, chamadas dos serviços e configurações necessário para executar a aplicação. - -## Ganha mais pontos - - Desenvolver utilizando TDD; - - Criar API de relatório; - - Sumário da quantidade de entrada e saída; - - Sumário da quantidade de entrada e saída de veículos por hora; - - Criar uma solução de autenticação. - -## Questionário para Avaliação de Competências - -### 1. GraphQL (Implementação BFF - Backend For Frontend) - - **Implementação:** Crie um BFF com GraphQL localmente para permitir as operações de CRUD e controle de entrada e saída de veículos. O BFF deve expor as operações e lidar com as interações entre o front-end e o back-end. - - **Disponibilização:** Após implementar o BFF, disponibilize o projeto publicamente no GitHub, com um link no README para o repositório. - - **Documentação:** Explique no README os benefícios de usar GraphQL no contexto do projeto, descrevendo também como configurar e rodar o BFF localmente. - - **Questões:** Além da implementação, responda às seguintes perguntas no README: - - **Pergunta 1**: Explique o que é o GraphQL e como ele se diferencia de uma API REST tradicional. - - **Pergunta 2**: Descreva como você implementaria o uso do GraphQL como BFF (Backend for Frontend) neste projeto de gerenciamento de estacionamento. Forneça exemplos práticos. - - **Pergunta 3**: Quais são os benefícios de utilizar GraphQL em relação à flexibilidade das consultas? Cite possíveis desafios ao utilizá-lo. - -### 2. Banco de Dados (Nível Básico) - - **Pergunta 1**: Explique os principais conceitos de um banco de dados relacional, como tabelas, chaves primárias e estrangeiras. - - **Pergunta 2**: No contexto de uma aplicação de gerenciamento de estacionamento, como você organizaria a modelagem de dados para suportar as funcionalidades de controle de entrada e saída de veículos? - - **Pergunta 3**: Quais seriam as vantagens e desvantagens de utilizar um banco de dados NoSQL neste projeto? - -### 3. Agilidade (Nível Básico) - - **Pergunta 1**: Explique o conceito de metodologias ágeis e como elas impactam o desenvolvimento de software. - - **Pergunta 2**: No desenvolvimento deste projeto, como você aplicaria princípios ágeis para garantir entregas contínuas e com qualidade? - - **Pergunta 3**: Qual a importância da comunicação entre as equipes em um ambiente ágil? Dê exemplos de boas práticas. - -### 4. DevOps (Nível Básico) - - **Pergunta 1**: O que é DevOps e qual a sua importância para o ciclo de vida de uma aplicação? - - **Pergunta 2**: Descreva como você integraria práticas de DevOps no desenvolvimento desta aplicação de estacionamento. Inclua exemplos de CI/CD. - - **Pergunta 3**: Cite as ferramentas que você usaria para automatizar o processo de deploy e monitoramento da aplicação. - -## Submissão -Crie um fork do teste para acompanharmos o seu desenvolvimento através dos seus commits. - -## Obrigado! -Agradecemos sua participação no teste. Boa sorte! 😄 +`POST /vehicles` +- Exemplo de body da request: + #CARRO: + + `{ + "brand": "FIAT", + "model": "CRONOS", + "color": "BRANCO", + "licencePlate": "ORT25B9", + "type": "CAR" + }` + +#MOTO: +`{ +"brand": "YAMAHA", +"model": "FACTOR 150", +"color": "PRETO", +"licencePlate": "HCG4T88", +"type": "MOTORCYCLE" +}` + + + `curl --location 'http://localhost:8080/vehicles' \ + --header 'Content-Type: application/json' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNjU2Nn0.FiS_A3QzP0893lb4IGbRO5JVmuaKPio5siE0Db_agSc' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ + --data '{ + "brand": "FIAT", + "model": "CRONOS", + "color": "BRANCO", + "licencePlate": "ORT25B9", + "type": "CAR" + }'` + +* Alterar token da request passando o token gerado no `POST /auth/login` + + +## Listar Veículos +`GET http://localhost:8080/vehicles` +Retorna todos os veículos cadastrados caso não passe nenhum parametro no @RequestParam + + + `curl --location 'http://localhost:8080/vehicles' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + + +`GET http://localhost:8080/vehicles?brand=FIAT&model=CRONOS&color=BRANCO&type=CAR` +Retorna todos os veículos cadastrados com os parametros fornecidos no @RequestParam + + `curl --location 'http://localhost:8080/vehicles?brand=FIAT&model=CRONOS&color=BRANCO&type=CAR' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + +`GET 'http://localhost:8080/vehicles/OCR5YBC'` +Retorna um veículo buscando por placa + + `curl --location 'http://localhost:8080/vehicles/OCR5YBC' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + + +## Atualiza veículo +`PUT 'http://localhost:8080/vehicles/98bb3a2e-1dac-402b-9c58-ffdad2d54450` + + `curl --location --request PUT 'http://localhost:8080/vehicles/98bb3a2e-1dac-402b-9c58-ffdad2d54450' \ + --header 'Content-Type: application/json' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ + --data '{ + "brand": "FIAT", + "model": "CRONOS", + "color": "BRANCO", + "licencePlate": "ORT25B9", + "type": "CAR" + }'` + + +## Deleta um veículo +`DELETE 'http://localhost:8080/vehicles/4d860137-3d34-4a00-a58c-3dce07b807c4` + + `curl --location --request DELETE 'http://localhost:8080/vehicles/4d860137-3d34-4a00-a58c-3dce07b807c4' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + + +## Funcionalidade de Entrada/Saída e veículos: +- Entrada: no body da request enviar placa do veículo e id do estabelecimento + + `curl --location 'http://localhost:8080/parking/getIn' \ + --header 'Content-Type: application/json' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ + --data '{ + "licensePlate": "OTT8T98", + "establishmentId": "7c9f1b17-e965-4cdc-a7ca-a70e95723e1a" + }'` + +- Saída: no body da request enviar placa de veiculo e id do estabelecimento + + `curl --location 'http://localhost:8080/parking/getOut' \ + --header 'Content-Type: application/json' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ + --data '{ + "licensePlate": "OTR4B26", + "establishmentId": "416683fa-b44f-4289-bb29-ca8d302cfccf" + }'` + + +## Relatórios +- Gerar Relatório de Estacionamento + +`GET /reports/parking/3de98d93-c14e-4004-9842-a5844103578c` +Gera um relatório em PDF com todas as entradas e saídas de veículos de um estacionamento. + +`GET /reports/parking/3de98d93-c14e-4004-9842-a5844103578c?dateTimeInitial=2024-09-03T05:30:00&dateTimeFinal=2024-09-03T05:30:00` +Gera um relatório em PDF com as entradas e saídas de veículos de um estacionamento filtrando por horario (formato `yyyy-MM0ddThh:mm:ss`). + + `curl --location 'http://localhost:8080/reports/parking/fe43f547-eb4f-4691-ba7d-4653661da680' \ + --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNzY2Nn0.udu8g7KpZzlxWglGVpvVXsLIEbwg02NjxvlKaAko0bI' \ + --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` + + +## Configuração para Execução +## Pré-requisitos +- Java 21 +- Gradle + +## Como Executar +- Clone o repositório: + `git clone https://github.com/mrenancidrao/backend-test-java.git` + `cd backend-test-java` + +- Build o projeto: + `./gradlew build` + +- Rode a aplicação: + `./gradlew bootRun` + + +## Como executar 2: +- Também é possível executar diretamente pela IDE (Intellij, Eclipse, etc.) +- Clicar com botão direito na classe BackendTestJavaApplication.java e selecionar 'Run BackendTestJavaApplication.main()' + + +## Acesse o H2 Console no browser: + +- URL: http://localhost:8080/h2-console +- JDBC URL: jdbc:h2:mem:testjava +- Usuário: sa +- Senha: 123456 + + +## Autenticação JWT +- Após registrar um usuário, use o endpoint /auth/login para obter o token JWT. Inclua esse token no header Authorization para acessar endpoints protegidos: + `Authorization: Bearer ` + + +## Considerações Finais + +Este projeto é uma implementação básica de um sistema de gestão de estacionamento com autenticação JWT e geração de relatórios em PDF. +Como melhorias posso destacar: +- A inclusão de camadas de handle de errors específicos para melhorar o retorno de erros para os clientes da API; +- As implementações de ParkingService (CarParkingServiceImpl e MotorcycleParkingServiceImpl) possuem código que se repete. Seria uma boa abordagem utilizar um padrão Template Method para deixar o codigo mais limpo e reutilizável. +- Adicionar id do estabelecimento no token para pegar essa informação automaticamente, ao invés de passar no body da request +- Usar uma api de autenticação mais robusta como um keycloack +- separar em microserviços +- adicionar duração de permanencia no relatório +- swagger para documentar a API \ No newline at end of file From 3670b87ecb32bf34e4b7635412c38f372a73c217 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Thu, 12 Sep 2024 18:54:41 -0300 Subject: [PATCH 17/18] readme changes --- README.md | 216 +--------------------- src/main/resources/application.properties | 1 - src/main/resources/application.yml | 7 +- 3 files changed, 4 insertions(+), 220 deletions(-) delete mode 100644 src/main/resources/application.properties diff --git a/README.md b/README.md index e6b5ef23..313587a7 100644 --- a/README.md +++ b/README.md @@ -24,221 +24,11 @@ password: 9876 ## Swagger http://localhost:8080/vehicle-api/swagger-ui/index.html -## Listar Estabelecimentos -`GET /establishments` -Retorna todos os estabelecimentos cadastrados caso não passe nenhum parametro no @RequestParam - -`GET /establishments/1` -Retorna o estabelecimento por id - - -`GET /establishments/cnpj/40245027000169` -Retorna o estabelecimento por cnpj - - `curl --location 'http://localhost:8080/establishments/cnpj/40245027000169' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - - -## Atualiza Estabelecimento - -`PUT 'http://localhost:8080/establishments/9e5f5223-ead1-4a7f-9bce-2dbd0ad63b13` - - `curl --location --request PUT 'http://localhost:8080/establishments/9e5f5223-ead1-4a7f-9bce-2dbd0ad63b13' \ - --header 'Content-Type: application/json' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ - --data '{ - "name": "ESTACIONAMENTO DO FALCAO", - "cnpj": "40245027000169", - "address": { - "street": "RUA CORONEL JOAO CORDEIRO", - "number": "67", - "city": "CAPITAL DO CEARÁ" - }, - "phone": "85998654679", - "numberCarSpaces": 10, - "numberMotorcycleSpaces": 10 - }'` - - -## Deleta Estabelecimento - `DELETE 'http://localhost:8080/establishments/3de98d93-c14e-4004-9842-a5844103578c` - - - `curl --location --request DELETE 'http://localhost:8080/establishments/3de98d93-c14e-4004-9842-a5844103578c' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNzY2Nn0.udu8g7KpZzlxWglGVpvVXsLIEbwg02NjxvlKaAko0bI' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - -* Alterar token da request passando o token gerado no `POST /auth/login` - - -## Cadastro de veículos -`POST /vehicles` -- Exemplo de body da request: - #CARRO: - - `{ - "brand": "FIAT", - "model": "CRONOS", - "color": "BRANCO", - "licencePlate": "ORT25B9", - "type": "CAR" - }` - -#MOTO: -`{ -"brand": "YAMAHA", -"model": "FACTOR 150", -"color": "PRETO", -"licencePlate": "HCG4T88", -"type": "MOTORCYCLE" -}` - - - `curl --location 'http://localhost:8080/vehicles' \ - --header 'Content-Type: application/json' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNjU2Nn0.FiS_A3QzP0893lb4IGbRO5JVmuaKPio5siE0Db_agSc' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ - --data '{ - "brand": "FIAT", - "model": "CRONOS", - "color": "BRANCO", - "licencePlate": "ORT25B9", - "type": "CAR" - }'` - -* Alterar token da request passando o token gerado no `POST /auth/login` - - -## Listar Veículos -`GET http://localhost:8080/vehicles` -Retorna todos os veículos cadastrados caso não passe nenhum parametro no @RequestParam - - - `curl --location 'http://localhost:8080/vehicles' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - - -`GET http://localhost:8080/vehicles?brand=FIAT&model=CRONOS&color=BRANCO&type=CAR` -Retorna todos os veículos cadastrados com os parametros fornecidos no @RequestParam - - `curl --location 'http://localhost:8080/vehicles?brand=FIAT&model=CRONOS&color=BRANCO&type=CAR' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - -`GET 'http://localhost:8080/vehicles/OCR5YBC'` -Retorna um veículo buscando por placa - - `curl --location 'http://localhost:8080/vehicles/OCR5YBC' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - - -## Atualiza veículo -`PUT 'http://localhost:8080/vehicles/98bb3a2e-1dac-402b-9c58-ffdad2d54450` - - `curl --location --request PUT 'http://localhost:8080/vehicles/98bb3a2e-1dac-402b-9c58-ffdad2d54450' \ - --header 'Content-Type: application/json' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ - --data '{ - "brand": "FIAT", - "model": "CRONOS", - "color": "BRANCO", - "licencePlate": "ORT25B9", - "type": "CAR" - }'` - - -## Deleta um veículo -`DELETE 'http://localhost:8080/vehicles/4d860137-3d34-4a00-a58c-3dce07b807c4` - - `curl --location --request DELETE 'http://localhost:8080/vehicles/4d860137-3d34-4a00-a58c-3dce07b807c4' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwMjM5OH0.tzwqHXPgZAuxycrMPaYOoZ7fDSrxUtjE0c60V9gRkLU' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - - -## Funcionalidade de Entrada/Saída e veículos: -- Entrada: no body da request enviar placa do veículo e id do estabelecimento - - `curl --location 'http://localhost:8080/parking/getIn' \ - --header 'Content-Type: application/json' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ - --data '{ - "licensePlate": "OTT8T98", - "establishmentId": "7c9f1b17-e965-4cdc-a7ca-a70e95723e1a" - }'` - -- Saída: no body da request enviar placa de veiculo e id do estabelecimento - - `curl --location 'http://localhost:8080/parking/getOut' \ - --header 'Content-Type: application/json' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6' \ - --data '{ - "licensePlate": "OTR4B26", - "establishmentId": "416683fa-b44f-4289-bb29-ca8d302cfccf" - }'` - - -## Relatórios -- Gerar Relatório de Estacionamento - -`GET /reports/parking/3de98d93-c14e-4004-9842-a5844103578c` -Gera um relatório em PDF com todas as entradas e saídas de veículos de um estacionamento. - -`GET /reports/parking/3de98d93-c14e-4004-9842-a5844103578c?dateTimeInitial=2024-09-03T05:30:00&dateTimeFinal=2024-09-03T05:30:00` -Gera um relatório em PDF com as entradas e saídas de veículos de um estacionamento filtrando por horario (formato `yyyy-MM0ddThh:mm:ss`). - - `curl --location 'http://localhost:8080/reports/parking/fe43f547-eb4f-4691-ba7d-4653661da680' \ - --header 'Authorization: Bearer eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJiYWNrZW5kLXRlc3QtamF2YSIsInN1YiI6ImNpZHJhbyIsImV4cCI6MTcyNTQwNzY2Nn0.udu8g7KpZzlxWglGVpvVXsLIEbwg02NjxvlKaAko0bI' \ - --header 'Cookie: JSESSIONID=B263D8C31DE84FC86B3A000503B8C9A6'` - - ## Configuração para Execução ## Pré-requisitos -- Java 21 -- Gradle +- Java 17 SDK ## Como Executar - Clone o repositório: - `git clone https://github.com/mrenancidrao/backend-test-java.git` - `cd backend-test-java` - -- Build o projeto: - `./gradlew build` - -- Rode a aplicação: - `./gradlew bootRun` - - -## Como executar 2: -- Também é possível executar diretamente pela IDE (Intellij, Eclipse, etc.) -- Clicar com botão direito na classe BackendTestJavaApplication.java e selecionar 'Run BackendTestJavaApplication.main()' - - -## Acesse o H2 Console no browser: - -- URL: http://localhost:8080/h2-console -- JDBC URL: jdbc:h2:mem:testjava -- Usuário: sa -- Senha: 123456 - - -## Autenticação JWT -- Após registrar um usuário, use o endpoint /auth/login para obter o token JWT. Inclua esse token no header Authorization para acessar endpoints protegidos: - `Authorization: Bearer ` - - -## Considerações Finais - -Este projeto é uma implementação básica de um sistema de gestão de estacionamento com autenticação JWT e geração de relatórios em PDF. -Como melhorias posso destacar: -- A inclusão de camadas de handle de errors específicos para melhorar o retorno de erros para os clientes da API; -- As implementações de ParkingService (CarParkingServiceImpl e MotorcycleParkingServiceImpl) possuem código que se repete. Seria uma boa abordagem utilizar um padrão Template Method para deixar o codigo mais limpo e reutilizável. -- Adicionar id do estabelecimento no token para pegar essa informação automaticamente, ao invés de passar no body da request -- Usar uma api de autenticação mais robusta como um keycloack -- separar em microserviços -- adicionar duração de permanencia no relatório -- swagger para documentar a API \ No newline at end of file + `git clone https://github.com/fcamarasantos/backend-test-java.git` +- Clicar com botão direito na classe ParkingApiApplication.java e selecionar 'Run ParkingApiApplication.main()' diff --git a/src/main/resources/application.properties b/src/main/resources/application.properties deleted file mode 100644 index fbce7ac7..00000000 --- a/src/main/resources/application.properties +++ /dev/null @@ -1 +0,0 @@ -spring.application.name=vehicle-api diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 7665f335..b95ee079 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -20,9 +20,4 @@ spring: hibernate: show_sql: false jackson: - time-zone: America/Sao_Paulo - -api: - security: - token: - secret: ${JWT_TOKEN:secret-key} \ No newline at end of file + time-zone: America/Sao_Paulo \ No newline at end of file From 5a08e798f48de02244fd858d0ecf2be459557534 Mon Sep 17 00:00:00 2001 From: "pedro.dantas" Date: Fri, 13 Sep 2024 00:04:45 -0300 Subject: [PATCH 18/18] readme changes --- README.md | 83 ++++++++++++++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 82 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 313587a7..83f30f57 100644 --- a/README.md +++ b/README.md @@ -30,5 +30,86 @@ http://localhost:8080/vehicle-api/swagger-ui/index.html ## Como Executar - Clone o repositório: - `git clone https://github.com/fcamarasantos/backend-test-java.git` + `git clone https://github.com/pedrolucas557/backend-test-java.git` - Clicar com botão direito na classe ParkingApiApplication.java e selecionar 'Run ParkingApiApplication.main()' + +## Questionário para Avaliação de Competências +## 1. GraphQL (Implementação BFF - Backend For Frontend) +- Pergunta 1: Explique o que é o GraphQL e como ele se diferencia de uma API REST tradicional. +- Pergunta 2: Descreva como você implementaria o uso do GraphQL como BFF (Backend for Frontend) neste projeto de +gerenciamento de estacionamento. Forneça exemplos práticos. +- Pergunta 3: Quais são os benefícios de utilizar GraphQL em relação à flexibilidade das consultas? +Cite possíveis desafios ao utilizá-lo. +- - - +- Resposta(Pergunta 1.1): GraphQL é uma forma de consultar APIs onde o cliente (frontend) pode pedir exatamente os dados +que precisa, sem mais nem menos. APIs REST geralmente têm vários endpoints (ex.: /users, /posts). No GraphQL, há apenas +um endpoint, e todas as consultas (queries) são feitas nele. +- Resposta(Pergunta 1.2): Implementação de Queries e Mutations: +Exemplo de Query: +type Query { + veiculoPorPlaca(placa: String!): Veiculo + veiculosPorMarca(marca: String!): [Veiculo] + estabelecimentos: [Estabelecimento] + } +Exemplo de Mutation: + type Mutation { + cadastrarVeiculo(marca: String!, modelo: String!, cor: String!, placa: String!, tipo: String!): Veiculo + cadastrarEstabelecimento(nome: String!, cnpj: String!, endereco: String!, telefone: String!, vagasMotos: Int!, vagasCarros: Int!): Estabelecimento + } +- Resposta(Pergunta 1.3): Alguns benefícios em relação a flexibilidade é que você pede só o que precisa com GraphQL, +consulta única para dados relacionados e facilidade de +evolução. Alguns dos possíveis desafios ao utilizá-lo são a complexidade na configuração inicial, perfomance de +consultas ea segurança. + +## 2. Banco de Dados (Nível Básico) +- Pergunta 1: Explique os principais conceitos de um banco de dados relacional, como tabelas, +chaves primárias e estrangeiras. +- Pergunta 2: No contexto de uma aplicação de gerenciamento de estacionamento, como você organizaria a modelagem +de dados para suportar as funcionalidades de controle de entrada e saída de veículos? +- Pergunta 3: Quais seriam as vantagens e desvantagens de utilizar um banco de dados NoSQL neste projeto? +- - - +- Resposta(Pergunta 2.1): Uma tabela em um banco de dados relacional é como uma planilha que você usa para organizar +informações. Ela armazena dados sobre um determinado assunto (por exemplo, "veículos" ou "estacionamento"), +de forma que cada linha da tabela representa um item ou registro, e cada coluna descreve um detalhe desse item. +- Resposta(Pergunta 2.2): A chave primária é um campo especial dentro da tabela que serve como identificador único de +cada registro. É como um RG ou CPF para cada linha da tabela, garantindo que cada registro seja único. Geralmente, +é um número (ID), mas pode ser qualquer coisa que identifique um item sem repetir. +- Resposta(Pergunta 2.3): Algumas vantagens seriam à flexibilidade no modelo de dados, a escalabilidade horizontal e a +alta perfomance com grandes volumes. +Algumas desvantagens seriam à falta de relacionamentos complexos, consistência eventual e menos ferramentas de análise +de dados. + +## 3. Agilidade (Nível Básico) + +- Pergunta 1: Explique o conceito de metodologias ágeis e como elas impactam o desenvolvimento de software. +- Pergunta 2: No desenvolvimento deste projeto, como você aplicaria princípios ágeis para garantir entregas contínuas +e com qualidade? +- Pergunta 3: Qual a importância da comunicação entre as equipes em um ambiente ágil? Dê exemplos de boas práticas. +- - - +- Resposta(Pergunta 3.1): + As metodologias ágeis são uma forma mais dinâmica e flexível de gerenciar projetos, especialmente no desenvolvimento +de software. A ideia central é dividir o trabalho em pequenas partes, chamadas de sprints ou ciclos curtos, +que geralmente duram de 1 a 4 semanas. +- Resposta(Pergunta 3.2): Dividir o Projeto em Pequenas Tarefas (Sprints), Sprint 1: Criar o cadastro de veículos. + Sprint 2: Implementar a funcionalidade de reserva de vagas. + Sprint 3: Integrar a autenticação de usuários. + - Resposta(Pergunta 3.3): A comunicação entre as equipes em um ambiente ágil é fundamental para o sucesso do projeto. + Como as metodologias ágeis são baseadas em ciclos curtos de desenvolvimento e em entregas contínuas, a colaboração + e o alinhamento constante entre todos os membros da equipe garantem que todos estejam na mesma página, evitando + retrabalhos e problemas de integração. Alguns bons exemplos: Reuniões diárias mais conhecidas como Daily, ferramentas + de colaboração como Jira, Trello e outros. + +## 4. DevOps (Nível Básico) +- Pergunta 1: O que é DevOps e qual a sua importância para o ciclo de vida de uma aplicação? +- Pergunta 2: Descreva como você integraria práticas de DevOps no desenvolvimento desta aplicação de estacionamento. +Inclua exemplos de CI/CD. +- Pergunta 3: Cite as ferramentas que você usaria para automatizar o processo de deploy e monitoramento da aplicação. +- - - +- Resposta(Pergunta 4.1): DevOps é uma maneira de aproximar as equipes de desenvolvimento (Dev) e operações (Ops) +para que elas trabalhem juntas de forma mais integrada e ágil. No DevOps, muita coisa é automatizada, como os testes e +a implantação do código. +- Resposta(Pergunta 4.2): Integrar práticas de DevOps no desenvolvimento da aplicação de estacionamento pode acelerar +as entregas, melhorar a qualidade do código e facilitar o gerenciamento da infraestrutura. Alguns exemplos: +Automação do Build e Testes (CI - Integração Contínua), entrega contínua e monitoramento e feedback contínuo. +- Resposta(Pergunta 4.3): Algumas ferramentas que eu usaria seriam: Jenkins, GitLab CI/CD, AWS CodePipeline, CircleCI e +GitHub Actions. \ No newline at end of file