alix.jeudi--lemoine
/
ScienceQuest
forked from tom.biard/ScienceQuest
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

suppression interfaces pour les services (inutiles car 1 interface = 1 service

Browse Source
Springboot
Victor SOULIER 1 year ago
parent 3601fe5523
commit ba7c865f57
18 changed files with 15 additions and 122 deletions
Show Stats Download Patch File Download Diff File

4
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/QuestionController.java
Unescape View File

@ -4,7 +4,7 @@ import fr.iut.sciencequest.sae.ApplicationConfig;
import fr.iut.sciencequest.sae.assemblers.QuestionModelAssembler;
import fr.iut.sciencequest.sae.dto.question.QuestionDTO;
import fr.iut.sciencequest.sae.entities.Question;
import fr.iut.sciencequest.sae.services.interfaces.IQuestionService;
import fr.iut.sciencequest.sae.services.QuestionService;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -18,7 +18,7 @@ import org.springframework.web.bind.annotation.*;
@AllArgsConstructor
@RequestMapping("/api/v1/questions")
public class QuestionController {
private final IQuestionService questionService;
private final QuestionService questionService;
private final QuestionModelAssembler questionModelAssembler;
@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")
private final PagedResourcesAssembler<Question> pagedResourcesAssembler;

4
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ScientifiqueController.java
Unescape View File

@ -9,7 +9,7 @@ import fr.iut.sciencequest.sae.dto.scientifique.ScientifiqueDTO;
import fr.iut.sciencequest.sae.entities.Indice;
import fr.iut.sciencequest.sae.entities.Scientifique;
import fr.iut.sciencequest.sae.services.IndiceService;
import fr.iut.sciencequest.sae.services.interfaces.IScientifiqueService;
import fr.iut.sciencequest.sae.services.ScientifiqueService;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.modelmapper.ModelMapper;
@ -28,7 +28,7 @@ import org.springframework.web.bind.annotation.*;
@RequestMapping("/api/v1/scientifiques")
public class ScientifiqueController {
private final IScientifiqueService scientifiqueService;
private final ScientifiqueService scientifiqueService;
private final ScientifiqueModelAssembler scientifiqueModelAssembler;
private final IndiceModelAssembler indiceModelAssembler;
@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")

4
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/ThematiqueController.java
Unescape View File

@ -6,7 +6,7 @@ import fr.iut.sciencequest.sae.assemblers.ThematiqueSimpleModelAssembler;
import fr.iut.sciencequest.sae.dto.thematique.ThematiqueLibelleOnlyDTO;
import fr.iut.sciencequest.sae.dto.thematique.ThematiqueSimpleDTO;
import fr.iut.sciencequest.sae.entities.Thematique;
import fr.iut.sciencequest.sae.services.interfaces.IThematiqueService;
import fr.iut.sciencequest.sae.services.ThematiqueService;
import jakarta.validation.Valid;
import lombok.AllArgsConstructor;
import org.modelmapper.ModelMapper;
@ -23,7 +23,7 @@ import org.springframework.web.bind.annotation.*;
@AllArgsConstructor
@RequestMapping("/api/v1/thematiques")
public class ThematiqueController {
private final IThematiqueService thematiqueService;
private final ThematiqueService thematiqueService;
private final ThematiqueModelAssembler thematiqueModelAssembler;
private final ThematiqueSimpleModelAssembler thematiqueSimpleModelAssembler;
@SuppressWarnings("SpringJavaInjectionPointsAutowiringInspection")

4
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/controllers/UtilisateurController.java
Unescape View File

@ -2,7 +2,7 @@ package fr.iut.sciencequest.sae.controllers;
import fr.iut.sciencequest.sae.dto.utilisateur.UtilisateurDTO;
import fr.iut.sciencequest.sae.dto.utilisateur.UtilisateurWithPasswordDTO;
import fr.iut.sciencequest.sae.services.interfaces.IUtilisateurService;
import fr.iut.sciencequest.sae.services.UtilisateurService;
import lombok.AllArgsConstructor;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
@ -11,7 +11,7 @@ import org.springframework.web.bind.annotation.*;
@RestController
@RequestMapping("/api/v1/utilisateur")
public class UtilisateurController {
private final IUtilisateurService utilisateurService;
private final UtilisateurService utilisateurService;
@PostMapping(consumes = MediaType.APPLICATION_JSON_VALUE, produces = MediaType.APPLICATION_JSON_VALUE)
@ResponseBody

4
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/DifficulteService.java
Unescape View File

@ -2,20 +2,18 @@ package fr.iut.sciencequest.sae.services;
import fr.iut.sciencequest.sae.entities.Difficulte;
import fr.iut.sciencequest.sae.repositories.DifficulteRepository;
import fr.iut.sciencequest.sae.services.interfaces.IDifficulteService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@Service
public class DifficulteService implements IDifficulteService {
public class DifficulteService {
private final DifficulteRepository difficulteRepository;
public DifficulteService(DifficulteRepository difficulteRepository){
this.difficulteRepository = difficulteRepository;
}
@Override
public Page<Difficulte> findAll(Pageable p){
return this.difficulteRepository.findAll(p);
}

6
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/IndiceService.java
Unescape View File

@ -4,13 +4,12 @@ import fr.iut.sciencequest.sae.entities.Indice;
import fr.iut.sciencequest.sae.exceptions.DuplicatedIdException;
import fr.iut.sciencequest.sae.exceptions.notFound.IndiceNotFoundException;
import fr.iut.sciencequest.sae.repositories.IndiceRepository;
import fr.iut.sciencequest.sae.services.interfaces.IIndiceService;
import org.springframework.stereotype.Service;
import java.lang.reflect.Field;
@Service
public class IndiceService implements IIndiceService {
public class IndiceService {
private final IndiceRepository indiceRepository;
@ -18,12 +17,10 @@ public class IndiceService implements IIndiceService {
this.indiceRepository = indiceRepository;
}
@Override
public Iterable<Indice> findByScientifiqueId(int id) {
return this.indiceRepository.findByScientifiqueId(id);
}
@Override
public Indice update(Indice indice){
if(!this.indiceRepository.existsById(indice.getId())){
throw new IndiceNotFoundException(indice.getId());
@ -31,7 +28,6 @@ public class IndiceService implements IIndiceService {
return this.indiceRepository.save(indice);
}
@Override
public Indice create(Indice indice){
if(indice.getId() != null && this.indiceRepository.existsById(indice.getId())){
throw new DuplicatedIdException();

3
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/PartieService.java
Unescape View File

@ -3,7 +3,6 @@ package fr.iut.sciencequest.sae.services;
import fr.iut.sciencequest.sae.entities.Partie;
import fr.iut.sciencequest.sae.exceptions.notFound.PartieNotFoundException;
import fr.iut.sciencequest.sae.repositories.PartieRepository;
import fr.iut.sciencequest.sae.services.interfaces.IPartieService;
import lombok.AllArgsConstructor;
import org.springframework.stereotype.Service;
@ -11,7 +10,7 @@ import java.util.List;
@AllArgsConstructor
@Service
public class PartieService implements IPartieService {
public class PartieService {
private final PartieRepository partieRepository;
/*private final JeuRepository jeuRepository;
private final UtilisateurRepository utilisateurRepository;

5
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/QuestionService.java
Unescape View File

@ -3,7 +3,6 @@ package fr.iut.sciencequest.sae.services;
import fr.iut.sciencequest.sae.entities.Question;
import fr.iut.sciencequest.sae.repositories.QuestionRepository;
import fr.iut.sciencequest.sae.repositories.ReponseRepository;
import fr.iut.sciencequest.sae.services.interfaces.IQuestionService;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -11,16 +10,14 @@ import org.springframework.stereotype.Service;
@AllArgsConstructor
@Service
public class QuestionService implements IQuestionService {
public class QuestionService {
private final QuestionRepository questionRepository;
private final ReponseRepository reponseRepository;
@Override
public Page<Question> findAll(Pageable p) {
return questionRepository.findAll(p);
}
@Override
public Page<Question> findWithCriteria(Pageable page, Integer scientifiqueId) {
return questionRepository.findAllQuestionsByScientifiqueId(page, scientifiqueId);
}

8
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/ScientifiqueService.java
Unescape View File

@ -10,7 +10,6 @@ import fr.iut.sciencequest.sae.exceptions.notFound.ThematiqueNotFoundException;
import fr.iut.sciencequest.sae.repositories.DifficulteRepository;
import fr.iut.sciencequest.sae.repositories.ScientifiqueRepository;
import fr.iut.sciencequest.sae.repositories.ThematiqueRepository;
import fr.iut.sciencequest.sae.services.interfaces.IScientifiqueService;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -21,24 +20,21 @@ import java.util.Optional;
@AllArgsConstructor
@Service
public class ScientifiqueService implements IScientifiqueService {
public class ScientifiqueService {
private final ScientifiqueRepository scientifiqueRepository;
private final ThematiqueRepository thematiqueRepository;
private final DifficulteRepository difficulteRepository;
private final IndiceService indiceService;
@Override
public Scientifique update(Scientifique scientifique) {
return null;
}
@Override
public Scientifique create(Scientifique scientifique) {
return null;
}
@Override
public Page<Scientifique> findAll(Pageable page) {
return scientifiqueRepository.findAll(page);
}
@ -58,12 +54,10 @@ public class ScientifiqueService implements IScientifiqueService {
return scientifiqueRepository.findAll(page);
}
@Override
public Scientifique findById(int id) {
return this.scientifiqueRepository.findById(id).orElseThrow(() -> new ScientifiqueNotFoundException(id));
}
@Override
public Iterable<Indice> getLinkedIndicesByScientifiqueId(int id){
if(!this.scientifiqueRepository.existsById(id)){
throw new ScientifiqueNotFoundException(id);

6
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/ThematiqueService.java
Unescape View File

@ -5,7 +5,6 @@ import fr.iut.sciencequest.sae.exceptions.DuplicatedFieldException;
import fr.iut.sciencequest.sae.exceptions.DuplicatedIdException;
import fr.iut.sciencequest.sae.exceptions.notFound.ThematiqueNotFoundException;
import fr.iut.sciencequest.sae.repositories.ThematiqueRepository;
import fr.iut.sciencequest.sae.services.interfaces.IThematiqueService;
import lombok.AllArgsConstructor;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@ -13,7 +12,7 @@ import org.springframework.stereotype.Service;
@AllArgsConstructor
@Service
public class ThematiqueService implements IThematiqueService {
public class ThematiqueService {
private final ThematiqueRepository thematiqueRepository;
private void checkFieldsConstraints(Thematique thematique){
@ -21,7 +20,6 @@ public class ThematiqueService implements IThematiqueService {
throw new DuplicatedFieldException("libelle");
}
}
@Override
public Thematique update(Thematique thematique){
if(!this.thematiqueRepository.existsById(thematique.getId())){
throw new ThematiqueNotFoundException(thematique.getId());
@ -30,7 +28,6 @@ public class ThematiqueService implements IThematiqueService {
return this.thematiqueRepository.save(thematique);
}
@Override
public Thematique create(Thematique thematique){
if(thematique.getId() != null && this.thematiqueRepository.existsById(thematique.getId())){
throw new DuplicatedIdException();
@ -39,7 +36,6 @@ public class ThematiqueService implements IThematiqueService {
return this.thematiqueRepository.save(thematique);
}
@Override
public Page<Thematique> findAll(Pageable p){
return this.thematiqueRepository.findAll(p);
}

6
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/UtilisateurService.java
Unescape View File

@ -6,7 +6,6 @@ import fr.iut.sciencequest.sae.entities.Utilisateur;
import fr.iut.sciencequest.sae.exceptions.IncorrectPasswordException;
import fr.iut.sciencequest.sae.exceptions.notFound.UtilisateurNotFoundException;
import fr.iut.sciencequest.sae.repositories.UtilisateurRepository;
import fr.iut.sciencequest.sae.services.interfaces.IUtilisateurService;
import lombok.AllArgsConstructor;
import org.modelmapper.ModelMapper;
import org.springframework.stereotype.Service;
@ -15,14 +14,13 @@ import java.util.Objects;
@AllArgsConstructor
@Service
public class UtilisateurService implements IUtilisateurService {
public class UtilisateurService {
private UtilisateurRepository utilisateurRepository;
//private BCryptPasswordEncoder passwordEncoder;
private ModelMapper modelMapper;
@Override
public UtilisateurDTO save(UtilisateurWithPasswordDTO user) {
Utilisateur utilisateur = this.modelMapper.map(user, Utilisateur.class);
//utilisateur.setMotDePasse(passwordEncoder.encode(user.getMotDePasse()));
@ -30,7 +28,6 @@ public class UtilisateurService implements IUtilisateurService {
return this.modelMapper.map(utilisateur, UtilisateurDTO.class);
}
@Override
public UtilisateurDTO login(UtilisateurWithPasswordDTO user) {
Utilisateur utilisateur = this.findUserByEmail(user.getEmail());
if(!utilisateur.getMotDePasse().equals(user.getMotDePasse())) throw new IncorrectPasswordException();
@ -41,7 +38,6 @@ public class UtilisateurService implements IUtilisateurService {
return this.modelMapper.map(utilisateur, UtilisateurDTO.class);
}
@Override
public Utilisateur findUserByEmail(String email) {
Utilisateur user = this.utilisateurRepository.findUtilisateurByEmail(email);
if(Objects.equals(user.getPseudo(), "")) {

9
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IDifficulteService.java
Unescape View File

@ -1,9 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Difficulte;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface IDifficulteService {
Page<Difficulte> findAll(Pageable p);
}

9
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IIndiceService.java
Unescape View File

@ -1,9 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Indice;
public interface IIndiceService {
Iterable<Indice> findByScientifiqueId(int id);
Indice update(Indice indice);
Indice create(Indice indice);
}

10
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IPartieService.java
Unescape View File

@ -1,10 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Partie;
import java.util.List;
public interface IPartieService {
Partie findById(int id);
Partie create(Integer idJeu, Integer idUtilisateur, List<Integer> thematiques, Integer idDifficulte);
}

10
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IQuestionService.java
Unescape View File

@ -1,10 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Question;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface IQuestionService {
Page<Question> findAll(Pageable page);
Page<Question> findWithCriteria(Pageable page, Integer scientifiqueId);
}

19
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IScientifiqueService.java
Unescape View File

@ -1,19 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Indice;
import fr.iut.sciencequest.sae.entities.Scientifique;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface IScientifiqueService {
Scientifique update(Scientifique scientifique);
Scientifique create(Scientifique scientifique);
Page<Scientifique> findAll(Pageable page);
Page<Scientifique> findAllWithCriteria(Pageable page, Integer tId, Integer dId);
Scientifique findById(int id);
Iterable<Indice> getLinkedIndicesByScientifiqueId(int id);
}

14
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IThematiqueService.java
Unescape View File

@ -1,14 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.entities.Thematique;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
public interface IThematiqueService {
Thematique update(Thematique thematique);
Thematique create(Thematique thematique);
Page<Thematique> findAll(Pageable p);
}

12
SpringBootProject/src/main/java/fr/iut/sciencequest/sae/services/interfaces/IUtilisateurService.java
Unescape View File

@ -1,12 +0,0 @@
package fr.iut.sciencequest.sae.services.interfaces;
import fr.iut.sciencequest.sae.dto.utilisateur.UtilisateurDTO;
import fr.iut.sciencequest.sae.dto.utilisateur.UtilisateurWithPasswordDTO;
import fr.iut.sciencequest.sae.entities.Utilisateur;
public interface IUtilisateurService {
UtilisateurDTO save(UtilisateurWithPasswordDTO user);
UtilisateurDTO login(UtilisateurWithPasswordDTO user);
Utilisateur findUserByEmail(String email);
}
Write Preview
Loading…
Cancel
Save