more properties to validator + tests

.gitignore

@@ -28,5 +28,6 @@ target/
 build/
 !**/src/main/**/build/
 !**/src/test/**/build/
+
 ### VS Code ###
 .vscode/

pom.xml

@@ -8,13 +8,13 @@
 		<version>2.7.0</version>
 		<relativePath/> <!-- lookup parent from repository -->
 	</parent>
-	<groupId>ro.radu</groupId>
+	<groupId>ro.cristi</groupId>
 	<artifactId>curs</artifactId>
 	<version>1.0.0</version>
-	<name>java-app</name>
-	<description>Java App</description>
+	<name>java</name>
+	<description>JavaApp</description>
 	<properties>
-		<java.version>11</java.version>
+		<java.version>17</java.version>
 	</properties>
 	<dependencies>
 		<dependency>
@@ -57,6 +57,12 @@
 			<artifactId>spring-security-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+		<dependency>
+     		<groupId>org.mockito</groupId>
+     		<artifactId>mockito-junit-jupiter</artifactId>
+     		<version>5.2.0</version>
+     		<scope>test</scope>
+		</dependency>
 	</dependencies>
 
 	<build>

src/main/java/ro/cristi/curs/Repository/CarRepository.java

@@ -1,4 +1,4 @@
-package ro.cristi.curs.Repository;
+package ro.cristi.curs.repository;
 
 import java.util.List;
 

src/main/java/ro/cristi/curs/Repository/MemoryRepository.java

@@ -1,4 +1,4 @@
-package ro.cristi.curs.Repository;
+package ro.cristi.curs.repository;
 
 import java.util.*;
 

src/main/java/ro/cristi/curs/configuration/cristi/CarRepositoryConfigCristi.java

@@ -4,15 +4,18 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.Profile;
 
-import ro.cristi.curs.Repository.MemoryRepository;
 import ro.cristi.curs.model.Car;
+import ro.cristi.curs.repository.MemoryRepository;
 
 @Configuration
 @Profile("cristi")
 public class CarRepositoryConfigCristi {
+
+    @Bean
     public void loadDataCristi() {
         List<Car> list = new ArrayList<>();
 

src/main/java/ro/cristi/curs/configuration/dev/CarRepositoryConfigDev.java

@@ -9,7 +9,7 @@
 import org.springframework.context.annotation.Profile;
 
 import ro.cristi.curs.model.Car;
-import ro.cristi.curs.Repository.*;
+import ro.cristi.curs.repository.*;
 
 @Configuration
 @Profile("dev")

src/main/java/ro/cristi/curs/configuration/local/CarRepositoryConfigLocal.java

@@ -9,7 +9,7 @@
 import org.springframework.context.annotation.Profile;
 
 import ro.cristi.curs.model.Car;
-import ro.cristi.curs.Repository.*;
+import ro.cristi.curs.repository.*;
 
 @Configuration
 @Profile("local")

src/main/java/ro/cristi/curs/controller/v1/HelloWorldController.java

@@ -21,6 +21,6 @@ public String getHello1() {
     @PostMapping(path = "/helloworld/hello1", consumes = { MediaType.APPLICATION_JSON_VALUE }, produces = {
             MediaType.APPLICATION_JSON_VALUE })
     public String postHello1(@RequestBody HelloRequest helloRequest) {
-        return "Hello World : " + helloRequest.getInput();
+        return "Hello World : " + helloRequest.getA();
     }
 }

src/main/java/ro/cristi/curs/controller/v2/HelloWorldButBetter.java

@@ -0,0 +1,58 @@
+package ro.cristi.curs.controller.v2;
+
+import java.util.ArrayList;
+
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import ro.cristi.curs.dto.HelloResponseButBetter;
+
+@RestController
+@RequestMapping("/v2")
+public class HelloWorldButBetter {
+
+    @GetMapping(path = "/lista/limbaje")
+    public String getLimbaje(){
+        ArrayList<String> listaLimbaje = new ArrayList<String>(){
+            {
+            add("Java");
+            add("C++");
+            add("Python");
+            add("N-am avut inspiratie");
+            }
+        };
+        return listaLimbaje.toString();
+    }
+
+
+    @GetMapping(path = "/lista/jocuri")
+    public String getJocuri(){
+        ArrayList<String> listaJocuri = new ArrayList<String>() {
+            {
+            add("Osu!");
+            add("Genshin");
+            add("Sekai");
+            add("Adofai");
+            }
+        };
+        return listaJocuri.toString();
+    }
+
+    @GetMapping(path = "/vorbe_intelepte")
+    public HelloResponseButBetter responseVorba(){
+        HelloResponseButBetter respo = new HelloResponseButBetter();
+        respo.setMotivational("iti merge bine vere");
+        respo.setDemotivational("sau poate ca nu cred ca o sa iti mearga (plangi)");
+        return respo;
+    }
+
+    @PostMapping(path = "/vorbe_neintelepte", consumes = {MediaType.APPLICATION_JSON_VALUE}, produces = {MediaType.APPLICATION_JSON_VALUE})
+    public String postHelloV2(@RequestBody HelloResponseButBetter helloRequest){
+        return "Vorbele tale motivationale: " + helloRequest.getMotivational() +  "\nSi alea demotivationale: " + helloRequest.getDemotivational();
+    }
+
+}

src/main/java/ro/cristi/curs/controller/v3/CarController.java

@@ -6,16 +6,16 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import ro.cristi.curs.Repository.CarRepository;
 import ro.cristi.curs.dto.CarDto;
 import ro.cristi.curs.mapper.CarMapper;
 import ro.cristi.curs.model.Car;
-import ro.cristi.curs.service.CarService;
+import ro.cristi.curs.repository.CarRepository;
+import ro.cristi.curs.service.CarServiceBasic;
 
 import java.util.*;
 
 @RestController
-@RequestMapping("/v1")
+@RequestMapping("/v3")
 public class CarController {
 
     @Autowired
@@ -25,7 +25,7 @@ public class CarController {
     CarMapper carMapper;
 
     @Autowired
-    CarService carService;
+    CarServiceBasic carService;
 
     @GetMapping("/car/list")
     public List<CarDto> getCars() {

src/main/java/ro/cristi/curs/dto/HelloRequest.java

@@ -7,6 +7,8 @@
 @Data
 public class HelloRequest {
 
-    @JsonProperty("input")
-    String input;
-}
+    @JsonProperty("a")
+    String a;
+    @JsonProperty("b")
+    String b;
+}

src/main/java/ro/cristi/curs/dto/HelloRequestButBetter.java

@@ -0,0 +1,14 @@
+package ro.cristi.curs.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+@Data
+public class HelloRequestButBetter {
+
+    @JsonProperty("motivational")
+    String motivational;
+    @JsonProperty("demotivational")
+    String demotivational;
+}

src/main/java/ro/cristi/curs/dto/HelloResponseButBetter.java

@@ -0,0 +1,14 @@
+package ro.cristi.curs.dto;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import lombok.Data;
+
+@Data
+public class HelloResponseButBetter {
+
+    @JsonProperty("motivational")
+    String motivational;
+    @JsonProperty("demotivational")
+    String demotivational;
+}

src/main/java/ro/cristi/curs/dto/SedanDto.java

@@ -7,3 +7,4 @@ public class SedanDto extends CarDto{
     private Integer doors;
     private Boolean isElectric;
 }
+

src/main/java/ro/cristi/curs/dto/VanDto.java

@@ -4,6 +4,7 @@
 
 @Data
 public class VanDto extends CarDto{
+
     private String capacity;
     private Integer payload;
 }

src/main/java/ro/cristi/curs/exception/CarServiceException.java

@@ -0,0 +1,16 @@
+package ro.cristi.curs.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CarServiceException extends RuntimeException{
+
+    private Integer errorCode;
+
+    public CarServiceException(Integer errorCode, String message){
+        super(message);
+        this.errorCode = errorCode;
+    }
+}

src/main/java/ro/cristi/curs/exception/CarValidatorException.java

@@ -0,0 +1,17 @@
+package ro.cristi.curs.exception;
+
+import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+@Data
+@EqualsAndHashCode(callSuper = false)
+public class CarValidatorException extends RuntimeException {
+
+    private Integer errorCode;
+
+    public CarValidatorException(Integer errorCode, String message) {
+        super(message);
+        this.errorCode = errorCode;
+    }
+}
+

src/main/java/ro/cristi/curs/service/CarService.java → src/main/java/ro/cristi/curs/service/CarServiceBasic.java

@@ -6,10 +6,11 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import ro.cristi.curs.Repository.CarRepository;
 import ro.cristi.curs.model.Car;
+import ro.cristi.curs.repository.CarRepository;
+
 @Service
-public class CarService {
+public class CarServiceBasic {
 
     @Autowired
     CarRepository carRepository;

src/main/java/ro/cristi/curs/service/CarServiceMemory.java

@@ -0,0 +1,13 @@
+package ro.cristi.curs.service;
+
+import java.util.List;
+
+import ro.cristi.curs.model.Car;
+
+public interface CarServiceMemory {
+    List<Car> getExpensiveCars(Integer percent);
+
+    List<Car> getOlderCars(Integer years);
+
+    List<Car> getEfficientCars(Integer units);
+}

src/main/java/ro/cristi/curs/service/CarServiceMemoryImpl.java

@@ -0,0 +1,60 @@
+package ro.cristi.curs.service;
+
+import java.math.BigDecimal;
+import java.util.List;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.context.annotation.Profile;
+import org.springframework.stereotype.Service;
+
+import ro.cristi.curs.exception.CarServiceException;
+import ro.cristi.curs.model.Car;
+import ro.cristi.curs.repository.CarRepository;
+
+@Service
+@Profile("local")
+public class CarServiceMemoryImpl implements CarServiceMemory {
+
+    @Autowired
+    CarRepository carRepository;
+
+    @Override
+    public List<Car> getExpensiveCars(Integer percent) throws CarServiceException {
+
+        List<Car> cars = carRepository.getAllCars();
+
+        if(percent > 100){
+            throw new CarServiceException(40001, "Percent must be less");
+        }
+        if (cars == null || cars.isEmpty()) {
+            throw new CarServiceException(50001, "No cars found");
+        } else if (cars.size()>1000) {
+            throw new CarServiceException(50002, "Too many cars found");
+        }
+        //after error checks
+        for (Car car : cars) {
+            car.setPrice(car.getPrice().multiply(BigDecimal.valueOf((100 + percent) / 100)));
+        }
+        return cars;
+    }
+
+    @Override
+    public List<Car> getOlderCars(Integer years){
+        //todo: exceptions
+        List<Car> cars = carRepository.getAllCars();
+        for(Car car : cars){
+            car.setYear(car.getYear() - years);
+        }
+        return cars;
+    }
+
+    @Override
+    public List<Car> getEfficientCars(Integer units){
+        //todo: exceptions
+        List<Car> cars = carRepository.getAllCars();
+        for(Car car : cars){
+            car.setConsumption(car.getConsumption() - units);
+        }
+        return cars;
+    } 
+}