s444329/Cars4You
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Merge remote-tracking branch 'origin/frontend'

Browse Source
This commit is contained in:
s452111 2020-01-19 21:15:07 +01:00
parent 5b67fb75aa
commit 56a9101d62
8 changed files with 22 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cars4you/src/main/client/html/js/sendingRequest.js
View File

@ -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);

10
cars4you/src/main/client/html/search.html
View File

@ -132,8 +132,8 @@
Skrzynia biegów:
<select id="gearbox">
<option value="-1">Dowolna</option>
<option value="manual">Manualna</option>
<option value="automatic">Automatyczna</option>
<option value="Manual">Manualna</option>
<option value="Automatic">Automatyczna</option>
</select>
</div>
</div>
@ -143,9 +143,9 @@
Rodzaj napędu:
<select id="drive_type">
<option value="-1">Dowolny</option>
<option value="1">Na przednie koła</option>
<option value="2">Na tylnie koła</option>
<option value="3">Na cztery koła</option>
<option value="przednie">Na przednie koła</option>
<option value="tylnie">Na tylnie koła</option>
<option value="4x4">Na cztery koła</option>
</select>
</div>
</div>

2
cars4you/src/main/java/com/cars/car4you/api/CarsController.java
View File

@ -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;

18
cars4you/src/main/java/com/cars/car4you/dto/CarDto.java
View File

@ -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;

2
cars4you/src/main/java/com/cars/car4you/model/Car.java
View File

@ -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;

2
cars4you/src/main/java/com/cars/car4you/repository/CarRepositoryImpl.java
View File

@ -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 + "%"));

5
cars4you/src/main/java/com/cars/car4you/service/CarService.java
View File

@ -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;
}

4
cars4you/src/main/resources/application.properties
View File

@ -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