Skip to content

Commit bc85ca1

Browse files
jjeanjacques10jjeanjacques10
committed
add open closed principle
1 parent b5f8e98 commit bc85ca1

22 files changed

+403
-50
lines changed

‎.idea/.gitignore

+3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/controller/TrainingController.java

+29
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
package com.jjeanjacques.solidbad.controller;
2+
3+
import com.jjeanjacques.solidbad.controller.dto.PokemonDTO;
4+
import com.jjeanjacques.solidbad.controller.dto.TrainingDTO;
5+
import com.jjeanjacques.solidbad.service.PokedexService;
6+
import com.jjeanjacques.solidbad.service.TrainingService;
7+
import org.springframework.beans.factory.annotation.Autowired;
8+
import org.springframework.http.ResponseEntity;
9+
import org.springframework.web.bind.annotation.*;
10+
11+
@RestController
12+
@RequestMapping("/training")
13+
public class TrainingController {
14+
15+
@Autowired
16+
private PokedexService pokedexService;
17+
18+
@Autowired
19+
private TrainingService trainingService;
20+
21+
@PostMapping("/{id}")
22+
public ResponseEntity<PokemonDTO> training(@PathVariable Long id,
23+
@RequestBody TrainingDTO trainingDTO) {
24+
var pokemon = pokedexService.getPokemon(id);
25+
var pokemonTrained = trainingService.trainPokemon(pokemon, trainingDTO);
26+
return ResponseEntity.ok(pokemonTrained);
27+
}
28+
29+
}

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/controller/dto/PokemonDTO.java

+7
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,13 @@
11
package com.jjeanjacques.solidbad.controller.dto;
22

3+
import com.fasterxml.jackson.annotation.JsonProperty;
34
import lombok.AllArgsConstructor;
45
import lombok.Builder;
56
import lombok.Data;
67
import lombok.NoArgsConstructor;
78

89
import javax.validation.constraints.NotNull;
10+
import java.time.LocalDateTime;
911

1012
@Data
1113
@Builder
@@ -25,5 +27,10 @@ public class PokemonDTO {
2527
private int total;
2628
private int generation;
2729
private int legendary;
30+
@JsonProperty("image_url")
2831
private String imageUrl;
32+
@JsonProperty("captured_at")
33+
private LocalDateTime capturedAt;
34+
@JsonProperty("last_workout")
35+
private LocalDateTime lastWorkout;
2936
}

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/controller/dto/TrainingDTO.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.jjeanjacques.solidbad.controller.dto;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
import java.time.LocalDateTime;
7+
8+
@Data
9+
@Builder
10+
public class TrainingDTO {
11+
12+
private float intension;
13+
private LocalDateTime date;
14+
15+
}

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/entity/Pokemon.java

+3
Original file line numberDiff line numberDiff line change
@@ -42,4 +42,7 @@ public class Pokemon implements Serializable {
4242
@Column(name = "captured_at")
4343
private LocalDateTime capturedAt;
4444

45+
@Column(name = "last_workout")
46+
private LocalDateTime lastWorkout;
47+
4548
}

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/exception/InvalidTraining.java

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.jjeanjacques.solidbad.exception;
2+
3+
public class InvalidTraining extends RuntimeException {
4+
5+
public InvalidTraining(String message) {
6+
super(message);
7+
}
8+
9+
}

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/service/PokedexService.java

+66-2
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,13 @@
88
import org.modelmapper.ModelMapper;
99
import org.springframework.beans.factory.annotation.Autowired;
1010
import org.springframework.beans.factory.annotation.Value;
11+
import org.springframework.format.annotation.DateTimeFormat;
1112
import org.springframework.stereotype.Service;
1213

1314
import java.sql.*;
15+
import java.time.Instant;
1416
import java.time.LocalDateTime;
17+
import java.time.ZoneId;
1518
import java.util.ArrayList;
1619
import java.util.List;
1720
import java.util.stream.Collectors;
@@ -47,6 +50,13 @@ public PokemonDTO getPokemon(String name) {
4750
return modelMapper.map(pokemon, PokemonDTO.class);
4851
}
4952

53+
public PokemonDTO getPokemon(Long id) {
54+
var pokemon = findById(id);
55+
if (pokemon == null)
56+
throw new NotFoundPokemon("Pokemon with id " + id + " not found");
57+
return modelMapper.map(pokemon, PokemonDTO.class);
58+
}
59+
5060
public Long addPokemon(PokemonDTO pokemonDTO) {
5161
var pokemon = modelMapper.map(pokemonDTO, Pokemon.class);
5262
var pokemonSaved = save(pokemon);
@@ -133,6 +143,41 @@ public Pokemon findByNameContaining(String name) {
133143
return pokemon;
134144
}
135145

146+
public Pokemon findById(Long id) {
147+
Pokemon pokemon = null;
148+
try (Connection connection = DriverManager.getConnection(DATABASE_URL, USER, PASSWORD)) {
149+
var sql = "SELECT * FROM POKEMON WHERE id = " + id;
150+
151+
Statement statement = connection.createStatement();
152+
ResultSet result = statement.executeQuery(sql);
153+
154+
while (result.next()) {
155+
LocalDateTime lastWorkout = null;
156+
if (result.getDate("last_workout") != null) {
157+
lastWorkout = Instant.ofEpochMilli(result.getDate("last_workout").getTime())
158+
.atZone(ZoneId.systemDefault())
159+
.toLocalDateTime();
160+
}
161+
pokemon = Pokemon.builder()
162+
.id(Long.valueOf(result.getInt("id")))
163+
.name(result.getString("name"))
164+
.description(result.getString("description"))
165+
.attack(result.getInt("attack"))
166+
.defense(result.getInt("defense"))
167+
.speed(result.getInt("speed"))
168+
.total(result.getInt("total"))
169+
.generation(result.getInt("generation"))
170+
.legendary(result.getInt("legendary"))
171+
.imageUrl(result.getString("image_url"))
172+
.lastWorkout(lastWorkout)
173+
.build();
174+
}
175+
} catch (SQLException e) {
176+
e.printStackTrace();
177+
}
178+
return pokemon;
179+
}
180+
136181
public Pokemon save(Pokemon pokemon) {/*<code>*/
137182
try (Connection connection = DriverManager.getConnection(DATABASE_URL, USER, PASSWORD)) {
138183
Class.forName("org.h2.Driver");
@@ -146,8 +191,27 @@ public Pokemon save(Pokemon pokemon) {/*<code>*/
146191
return findByNameContaining(pokemon.getName());
147192
}
148193

149-
public Pokemon update(Pokemon pokemon) {/*<code>*/
150-
return null;
194+
public Pokemon update(Pokemon pokemon) {
195+
try (Connection connection = DriverManager.getConnection(DATABASE_URL, USER, PASSWORD)) {
196+
Class.forName("org.h2.Driver");
197+
198+
Statement statement = connection.createStatement();
199+
statement.execute("UPDATE POKEMON SET name = '" + pokemon.getName() + "', " +
200+
"description = '" + pokemon.getDescription() + "', " +
201+
"hp = " + pokemon.getHp() + ", " +
202+
"attack = " + pokemon.getAttack() + ", " +
203+
"defense = " + pokemon.getDefense() + ", " +
204+
"speed = " + pokemon.getSpeed() + ", " +
205+
"total = " + pokemon.getTotal() + ", " +
206+
"generation = " + pokemon.getGeneration() + ", " +
207+
"legendary = " + pokemon.getLegendary() + ", " +
208+
"image_url = '" + pokemon.getImageUrl() + "', " +
209+
"last_workout = '" + pokemon.getLastWorkout() + "'" +
210+
" WHERE id = " + pokemon.getId() + ";");
211+
} catch (Exception e) {
212+
e.printStackTrace();
213+
}
214+
return findById(pokemon.getId());
151215
}
152216

153217
public void deleteById(Long id) {

‎solid-bad/src/main/java/com/jjeanjacques/solidbad/service/TrainingService.java

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.jjeanjacques.solidbad.service;
2+
3+
import com.jjeanjacques.solidbad.controller.dto.PokemonDTO;
4+
import com.jjeanjacques.solidbad.controller.dto.TrainingDTO;
5+
import com.jjeanjacques.solidbad.entity.Pokemon;
6+
import com.jjeanjacques.solidbad.exception.InvalidTraining;
7+
import org.modelmapper.ModelMapper;
8+
import org.springframework.beans.factory.annotation.Autowired;
9+
import org.springframework.stereotype.Service;
10+
11+
import java.time.LocalDateTime;
12+
import java.time.temporal.ChronoUnit;
13+
14+
@Service
15+
public class TrainingService {
16+
17+
@Autowired
18+
PokedexService pokedexService;
19+
20+
@Autowired
21+
ModelMapper modelMapper;
22+
23+
public PokemonDTO trainPokemon(PokemonDTO pokemon, TrainingDTO training) {
24+
if (pokemon.getLastWorkout() != null) {
25+
var hoursBetweenDates = ChronoUnit.HOURS.between(pokemon.getLastWorkout(), LocalDateTime.now());
26+
if (hoursBetweenDates < 8) {
27+
throw new InvalidTraining("Your pokemon is tired, wait 8 hours");
28+
}
29+
}
30+
31+
if (pokemon.getAttack() > 1000) {
32+
throw new InvalidTraining("Pokemon attack cannot be greater than 1000");
33+
}
34+
35+
int newAttack = Math.round(pokemon.getAttack() + (pokemon.getAttack() * (training.getIntension() / 100)));
36+
int newDefense = Math.round(pokemon.getDefense() + (pokemon.getDefense() * (training.getIntension() / 100)));
37+
pokemon.setAttack(newAttack);
38+
pokemon.setDefense(newDefense);
39+
pokemon.setLastWorkout(LocalDateTime.now());
40+
pokedexService.update(modelMapper.map(pokemon, Pokemon.class));
41+
return pokemon;
42+
}
43+
44+
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/controller/TrainingController.java

+42
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.jjeanjacques.solidgood.controller;
2+
3+
import com.jjeanjacques.solidgood.controller.dto.PokemonDTO;
4+
import com.jjeanjacques.solidgood.controller.dto.TrainingDTO;
5+
import com.jjeanjacques.solidgood.repository.PokemonRepository;
6+
import com.jjeanjacques.solidgood.service.PokedexService;
7+
import com.jjeanjacques.solidgood.service.TrainingService;
8+
import com.jjeanjacques.solidgood.service.impl.TrainingServiceImpl;
9+
import com.jjeanjacques.solidgood.service.impl.training.TrainingValidation;
10+
import com.jjeanjacques.solidgood.service.impl.training.ValidateDateLastWorkout;
11+
import com.jjeanjacques.solidgood.service.impl.training.ValidatePokemonPowerLimit;
12+
import org.modelmapper.ModelMapper;
13+
import org.springframework.beans.factory.annotation.Autowired;
14+
import org.springframework.http.ResponseEntity;
15+
import org.springframework.web.bind.annotation.*;
16+
17+
import java.util.List;
18+
19+
@RestController
20+
@RequestMapping("/training")
21+
public class TrainingController {
22+
23+
@Autowired
24+
private PokedexService pokedexService;
25+
26+
@Autowired
27+
private PokemonRepository pokemonRepository;
28+
29+
private TrainingService trainingService;
30+
31+
@PostMapping("/{id}")
32+
public ResponseEntity<PokemonDTO> training(@PathVariable Long id,
33+
@RequestBody TrainingDTO trainingDTO) {
34+
List<TrainingValidation> validations = List.of(new ValidateDateLastWorkout(), new ValidatePokemonPowerLimit());
35+
this.trainingService = new TrainingServiceImpl(validations, new ModelMapper(), pokemonRepository);
36+
37+
var pokemon = pokedexService.getPokemon(id);
38+
var pokemonTrained = trainingService.trainPokemon(pokemon, trainingDTO);
39+
return ResponseEntity.ok(pokemonTrained);
40+
}
41+
42+
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/controller/dto/PokemonDTO.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ public class PokemonDTO {
2626
private int defense;
2727
private int speed;
2828
private int total;
29-
private int generation;
30-
private int legendary;
3129
private TypePokemon type;
3230
@JsonProperty("image_url")
3331
private String imageUrl;
3432
@JsonProperty("captured_at")
3533
private LocalDateTime capturedAt;
34+
@JsonProperty("last_workout")
35+
private LocalDateTime lastWorkout;
3636

3737
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/controller/dto/TrainingDTO.java

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.jjeanjacques.solidgood.controller.dto;
2+
3+
import lombok.Builder;
4+
import lombok.Data;
5+
6+
import java.time.LocalDateTime;
7+
8+
@Data
9+
@Builder
10+
public class TrainingDTO {
11+
12+
private float intension;
13+
private LocalDateTime date;
14+
15+
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/entity/Pokemon.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@ public class Pokemon implements Serializable {
3030
private int defense;
3131
private int speed;
3232
private int total;
33-
private int generation;
34-
private int legendary;
3533

3634
@Enumerated(EnumType.STRING)
3735
private TypePokemon type;
@@ -42,4 +40,7 @@ public class Pokemon implements Serializable {
4240
@Column(name = "captured_at")
4341
private LocalDateTime capturedAt;
4442

43+
@Column(name = "last_workout")
44+
private LocalDateTime lastWorkout;
45+
4546
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/exception/InvalidTraining.java

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
package com.jjeanjacques.solidgood.exception;
2+
3+
public class InvalidTraining extends RuntimeException {
4+
5+
public InvalidTraining(String message) {
6+
super(message);
7+
}
8+
9+
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/exception/NotFoundPokemon.java

+1
Original file line numberDiff line numberDiff line change
@@ -5,4 +5,5 @@ public class NotFoundPokemon extends RuntimeException {
55
public NotFoundPokemon(String message) {
66
super(message);
77
}
8+
89
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/service/PokedexService.java

+1
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ public interface PokedexService {
1111
void calculateTotalSum();
1212
List<PokemonDTO> getAllPokemon();
1313
PokemonDTO getPokemon(String name);
14+
PokemonDTO getPokemon(Long id);
1415
Long addPokemon(PokemonDTO pokemonDTO);
1516
void deletePokemon(Long id);
1617

‎solid-good/src/main/java/com/jjeanjacques/solidgood/service/TrainingService.java

+10
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
package com.jjeanjacques.solidgood.service;
2+
3+
import com.jjeanjacques.solidgood.controller.dto.PokemonDTO;
4+
import com.jjeanjacques.solidgood.controller.dto.TrainingDTO;
5+
6+
public interface TrainingService {
7+
8+
PokemonDTO trainPokemon(PokemonDTO pokemon, TrainingDTO training);
9+
10+
}

‎solid-good/src/main/java/com/jjeanjacques/solidgood/service/impl/PokedexServiceImpl.java

+8
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,14 @@ public PokemonDTO getPokemon(String name) {
4242
return modelMapper.map(pokemon, PokemonDTO.class);
4343
}
4444

45+
@Override
46+
public PokemonDTO getPokemon(Long id) {
47+
var pokemon = pokemonRepository.findById(id).get();
48+
if (pokemon == null)
49+
throw new NotFoundPokemon("Pokemon with id " + id + " not found");
50+
return modelMapper.map(pokemon, PokemonDTO.class);
51+
}
52+
4553
@Override
4654
@Transactional
4755
public Long addPokemon(PokemonDTO pokemonDTO) {

0 commit comments

Comments
 (0)