Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 0 additions & 33 deletions src/main/java/de/tekup/studentsabsence/entities/Absence.java

This file was deleted.

36 changes: 0 additions & 36 deletions src/main/java/de/tekup/studentsabsence/entities/Group.java

This file was deleted.

3 changes: 3 additions & 0 deletions src/main/java/de/tekup/studentsabsence/entities/Image.java
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,7 @@ public class Image {
private String fileType;
@Lob
private byte[] data;

@OneToOne(mappedBy = "Image")
private List<Student> studentList;
}
35 changes: 0 additions & 35 deletions src/main/java/de/tekup/studentsabsence/entities/Student.java

This file was deleted.

5 changes: 5 additions & 0 deletions src/main/java/de/tekup/studentsabsence/entities/Subject.java
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,9 @@ public class Subject implements Serializable {
@NotBlank(message = "Name is required")
private String name;

@OneToOne(mappedBy = "Subject")
private List<Absence> absenceList;

@ManyToMany(mappedBy = "Subject")
private List<Group> groupList;
}
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@
import java.util.Optional;

public interface GroupSubjectRepository extends CrudRepository<GroupSubject, GroupSubjectKey> {
List<GroupSubject> findAllByGroup(Group id);
///TODO create a methode to find a groupSubject by Group Id and Subject Id

List<GroupSubject> findAllByGroup(Long gid, Long sid);

///TODO create a methode to find a groupSubject by Group Id and Subject Id , ok
}
Original file line number Diff line number Diff line change
Expand Up @@ -32,17 +32,21 @@ public List<Absence> getAllAbsencesByGroupId(Long id) {
@Override
public List<Absence> getAllAbsencesByStudentId(Long sid) {
List<Absence> absences = new ArrayList<>();
//TODO complete the missing instructions
absenceRepository.findAllByStudent_Student_Id(id).forEach(absences::add);
//TODO complete the missing instructions , ok
return absences;
}

@Override
public List<Absence> getAllAbsencesByStudentIdAndSubjectId(Long sid, Long id) {
List<Absence> absences = new ArrayList<>();
//TODO complete the missing instructions
absenceRepository.findAllByStudent_Student_IdAndSubject_Id(sid, id).forEach(absences::add);

//TODO complete the missing instructions , ok
return absences;
}


@Override
public List<Absence> getAllAbsencesByGroupIdAndSubjectId(Long gid, Long id) {
List<Absence> absences = new ArrayList<>();
Expand Down Expand Up @@ -84,10 +88,11 @@ public float hoursCountByStudentAndSubject(Long sid, Long id) {
List<Absence> absences = getAllAbsencesByStudentIdAndSubjectId(sid, id);
return countHours(absences);
}
//TODO Complete the countHours method
//TODO Complete the countHours method , not ok
public float countHours(List<Absence> absences) {
List<Absence> absences = getAllAbsences(absences);
return countHours(absences);

return 0;
}

}
Original file line number Diff line number Diff line change
Expand Up @@ -38,8 +38,9 @@ public List<GroupSubject> getSubjectsByGroupId(Long id) {

@Override
public void deleteSubjectFromGroup(Long gid, Long sid) {
//TODO find a groupSubject by Group Id and Subject Id
GroupSubject groupSubject = null;
//TODO find a groupSubject by Group Id and Subject Id , ok

GroupSubject groupSubject = getGroupById(gid,sid);

groupSubjectRepository.delete(groupSubject);
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,11 @@
public class ImageServiceImp implements ImageService {
private final ImageRepository imageRepository;

//TODO Complete this method
//TODO Complete this method , ok
@Override
public Image getImage(String id) {
return null;
}

return imageRepository.findById(id).
orElseThrow(() -> new NoSuchElementException("No Image with ID: " + id));
@Override
public Image addImage(MultipartFile image) throws IOException {
String fileName = StringUtils.cleanPath(image.getOriginalFilename());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -34,15 +34,22 @@ public Student addStudent(Student student) {

}

//TODO Complete this method
//TODO Complete this method , ok
@Override
public Student updateStudent(Student student) {
return null;

if (!studentRepository.existsById(student.getId())) {
throw new NoSuchElementException("No student with ID : " + student.getId());
}
return studentRepository.save(student);
}

//TODO Complete this method
@Override
public Student deleteStudent(Long sid) {
return null;

Student student = getStudentById(id);
studentRepository.delete(student);
return student;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,13 @@
public class SubjectServiceImp implements SubjectService {
private final SubjectRepository subjectRepository;

//TODO Complete this method
//TODO Complete this method , ok
@Override
public List<Subject> getAllSubjects() {
return null;
public List<Subject> getAllSubject() {
List<Subject> subjects = new ArrayList<>();
subjectRepository.findAll().forEach(subjects::add);
return subjects;
}

@Override
public Subject getSubjectById(Long id) {
return subjectRepository.findById(id).
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
paquet de . tekup . absence des étudiants . entités ;

importer lombok . AllArgsConstructor ;
importer lombok . Données ;
importer lombok . NoArgsConstructor ;
org d'importation . cadre de ressort . formater . annotation . FormatDateHeure ;

importer javax . persistance .*;
importer javax . validation . contraintes . NonNull ;
importer javax . validation . contraintes . Passé ;
importer javax . validation . contraintes . Positif ;
importer java . io . Sérialisable ;
importer java . temps . DateHeureLocale ;

@ Entité
@ Données
@ AllArgsConstructor
@ NoArgsConstructor
public class Absence implémente Serializable {
@ identifiant
@ GeneratedValue ( stratégie = GenerationType . IDENTITY )
ID long privé ;
@ NotNull ( message = "La date de début est requise" )
@ Past ( message = "Devrait être une date dans le passé" )
@ DateTimeFormat ( pattern = "jj-MM-aaaa HH:mm" )
date de début privée DateHeureLocale ;
@ NotNull ( message = "Des heures sont requises" )
@ Positif ( message = "Devrait être positif" )
heures de flotteur privé ;
//TODO Terminer les relations avec d'autres entités
@ OneToOne
@ JoinColumn ( nom = "nom" )
{
Sujet privé sujet ;
}
@ ManyToOne
@ JoinColumn ( nom = "prénom" )
{
Étudiant privé étudiant ;
}

public Long getId () {
retourner l'identifiant ;
}

public void setId ( ID long ) {
cela . identifiant = identifiant ;
}

public LocalDateTime getStartDate () {
retourne startDate ;
}

public void setStartDate ( LocalDateTime startDate ) {
cela . date de début = date de début ;
}

flotteur public getHeures () {
heures de retour ;
}

public void setHours ( heures flottantes ) {
cela . heures = heures ;
}

Objet public getSubject () {
retour sujet ;
}

public void setSubject ( Sujet sujet ) {
cela . sujet = sujet ;
}

public Étudiant getÉtudiant () {
étudiant de retour ;
}

public void setStudent ( Étudiant étudiant ) {
cela . étudiant = étudiant ;
}
}
Loading