From 56a9101d62cdfbcd72de71b0f3f68cbf22af893e Mon Sep 17 00:00:00 2001 From: s452111 Date: Sun, 19 Jan 2020 21:15:07 +0100 Subject: [PATCH] Merge remote-tracking branch 'origin/frontend' --- .../src/main/client/html/js/sendingRequest.js | 2 +- cars4you/src/main/client/html/search.html | 10 +++++----- .../com/cars/car4you/api/CarsController.java | 2 -- .../main/java/com/cars/car4you/dto/CarDto.java | 18 +++++++++--------- .../main/java/com/cars/car4you/model/Car.java | 2 +- .../car4you/repository/CarRepositoryImpl.java | 2 +- .../com/cars/car4you/service/CarService.java | 5 +++-- .../src/main/resources/application.properties | 4 ++-- 8 files changed, 22 insertions(+), 23 deletions(-) diff --git a/cars4you/src/main/client/html/js/sendingRequest.js b/cars4you/src/main/client/html/js/sendingRequest.js index f8a3e28..0e20dce 100644 --- a/cars4you/src/main/client/html/js/sendingRequest.js +++ b/cars4you/src/main/client/html/js/sendingRequest.js @@ -14,7 +14,7 @@ // let url = "https://jsonplaceholder.typicode.com/photos"; // let url = "https://webhook.site/b1792c3d-cd5a-4c29-8e9c-1ff9f84653eb"; // let url = "http://34.65.132.148:8080"; - let url = "http://localhost:8080/api/cars/search"; + let url = "http://localhost:8080/car/api/search"; var params = []; if(fuel_type.value != -1){ params.push("fuel_type="+fuel_type.options[fuel_type.value].text); diff --git a/cars4you/src/main/client/html/search.html b/cars4you/src/main/client/html/search.html index 86026b7..da23e14 100644 --- a/cars4you/src/main/client/html/search.html +++ b/cars4you/src/main/client/html/search.html @@ -132,8 +132,8 @@ Skrzynia biegów: @@ -143,9 +143,9 @@ Rodzaj napędu: diff --git a/cars4you/src/main/java/com/cars/car4you/api/CarsController.java b/cars4you/src/main/java/com/cars/car4you/api/CarsController.java index 37976f2..4613513 100644 --- a/cars4you/src/main/java/com/cars/car4you/api/CarsController.java +++ b/cars4you/src/main/java/com/cars/car4you/api/CarsController.java @@ -2,8 +2,6 @@ package com.cars.car4you.api; import com.cars.car4you.dto.CarDto; import com.cars.car4you.model.Car; -import com.cars.car4you.model.CarDetails; -import com.cars.car4you.repository.CarDetailRepository; import com.cars.car4you.repository.CarRepository; import com.cars.car4you.service.CarService; import org.springframework.beans.factory.annotation.Autowired; diff --git a/cars4you/src/main/java/com/cars/car4you/dto/CarDto.java b/cars4you/src/main/java/com/cars/car4you/dto/CarDto.java index 4d16cc1..3cd5e7b 100644 --- a/cars4you/src/main/java/com/cars/car4you/dto/CarDto.java +++ b/cars4you/src/main/java/com/cars/car4you/dto/CarDto.java @@ -11,18 +11,18 @@ public class CarDto { private String brand; private String model; private String version; - private int year; - private int engine_power; - private double engine_capacity; + private Integer year; + private Integer engine_power; + private Double engine_capacity; private String transmission; private String drive; private String body_type; - private int doors; - private int seats; - private long price_from; - private long price_to; - private long average; - private double rating; + private Integer doors; + private Integer seats; + private Long price_from; + private Long price_to; + private Long average; + private Double rating; private String fuel; private String[] car_pros; private String[] car_cons; diff --git a/cars4you/src/main/java/com/cars/car4you/model/Car.java b/cars4you/src/main/java/com/cars/car4you/model/Car.java index 2d79ad3..dbdc356 100644 --- a/cars4you/src/main/java/com/cars/car4you/model/Car.java +++ b/cars4you/src/main/java/com/cars/car4you/model/Car.java @@ -58,7 +58,7 @@ public class Car { private Long price_to; @Column(nullable = false, unique = false) - private Long avarage; + private Double avarage; @Column(nullable = false, unique = false) private String fuel; diff --git a/cars4you/src/main/java/com/cars/car4you/repository/CarRepositoryImpl.java b/cars4you/src/main/java/com/cars/car4you/repository/CarRepositoryImpl.java index 36cb09c..70581f8 100644 --- a/cars4you/src/main/java/com/cars/car4you/repository/CarRepositoryImpl.java +++ b/cars4you/src/main/java/com/cars/car4you/repository/CarRepositoryImpl.java @@ -35,7 +35,7 @@ public class CarRepositoryImpl implements CustomCarRepository { LocalDateTime localDateTime = LocalDateTime.now(); if(maxPrice != null) predicates.add(criteriaBuilder.lessThanOrEqualTo(car.get("price_to"), maxPrice)); - if(maxYearsOld != null) predicates.add(criteriaBuilder.greaterThanOrEqualTo(car.get("year"),localDateTime.getYear() - maxYearsOld)); + if(maxYearsOld != null) predicates.add(criteriaBuilder.greaterThanOrEqualTo(car.get("year"),localDateTime.getYear() - maxYearsOld - 1)); if(enginePowerFrom != null) predicates.add(criteriaBuilder.greaterThanOrEqualTo(car.get("engine_power"), enginePowerFrom)); if(enginePowerTo != null) predicates.add(criteriaBuilder.lessThanOrEqualTo(car.get("engine_power"), enginePowerTo)); if(transmission != null && !transmission.isEmpty()) predicates.add(criteriaBuilder.like(car.get("transmission"), "%" + transmission + "%")); diff --git a/cars4you/src/main/java/com/cars/car4you/service/CarService.java b/cars4you/src/main/java/com/cars/car4you/service/CarService.java index c547f17..3b84921 100644 --- a/cars4you/src/main/java/com/cars/car4you/service/CarService.java +++ b/cars4you/src/main/java/com/cars/car4you/service/CarService.java @@ -32,7 +32,7 @@ public class CarService { // ceny carDto.setPrice_from(car.getPrice_from()); carDto.setPrice_to(car.getPrice_to()); - carDto.setAverage(car.getAvarage()); + carDto.setAverage(car.getAvarage().longValue()); // Parametry konieczne do przepisania z CarDetails (cars_details) carDto.setBrand(car.getCarDetails().getBrand()); @@ -46,8 +46,9 @@ public class CarService { carDto.setAverage(car.getCarDetails().getAverage()); carDto.setCar_cons(car.getCarDetails().getCar_cons()); carDto.setCar_pros(car.getCarDetails().getCar_pros()); - carDto.setRating(car.getCarDetails().getRating()); } + if(carDto.getRating() != null) carDto.setRating(car.getCarDetails().getRating()); + return carDto; } diff --git a/cars4you/src/main/resources/application.properties b/cars4you/src/main/resources/application.properties index 2bcd63a..5a5c6b8 100644 --- a/cars4you/src/main/resources/application.properties +++ b/cars4you/src/main/resources/application.properties @@ -12,8 +12,8 @@ spring.datasource.password=car4yourootek spring.jpa.show-sql=true -#spring.jpa.generate-ddl=true +spring.jpa.generate-ddl=true -#spring.jpa.hibernate.ddl-auto=validate +spring.jpa.hibernate.ddl-auto=validate #spring.jpa.properties.hibernate.jdbc.lob.non_contextual_creation=false \ No newline at end of file