Add the date and identitycard feature to inscriptionRequest

This commit is contained in:
2024-03-27 16:04:55 +01:00
parent 839ca414ce
commit 94f12f0a86
5 changed files with 51 additions and 20 deletions

View File

@ -101,10 +101,9 @@ public class MockController {
CurriculumCourseService.save(new CurriculumCourse(chemistryBab1,chemistry1));
InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password");
InscriptionRequest inscriptionRequest = new InscriptionRequest("helen","prenom","non","helen@gmail.com","america",new Date(),(long) 1,RequestState.Pending,"yes.png","password", null, new Date());
inscriptionService.save(inscriptionRequest);
}
}

View File

@ -87,7 +87,8 @@ public class ProtectionService {
toReturn.put("curriculum", inscriptionRequest.getCurriculumId());
toReturn.put("state", inscriptionRequest.getState());
toReturn.put("profilePictureUrl", inscriptionRequest.getProfilePicture());
toReturn.put("identityCard", inscriptionRequest.getIdentityCard());
toReturn.put("submissionDate", inscriptionRequest.getSubmissionDate());
return toReturn;
}

View File

@ -19,10 +19,12 @@ public class InscriptionRequest {
private Long curriculumId;
private RequestState state;
private String profilePicture;
private String password;
private String identityCard;
private Date submissionDate;
public InscriptionRequest(){}
public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password){
public InscriptionRequest(String lastName, String firstName, String address, String email, String country, Date birthDate,Long curriculumId, RequestState state, String profilePicture, String password, String identityCard, Date submissionDate){
this.lastName = lastName;
this.firstName = firstName;
this.address = address;
@ -33,6 +35,8 @@ public class InscriptionRequest {
this.state = state;
this.profilePicture = profilePicture;
this.password = password;
this.identityCard = identityCard;
this.submissionDate = submissionDate;
}
public int getId() {
@ -118,4 +122,20 @@ public class InscriptionRequest {
public void setPassword(String password) {
this.password = password;
}
public String getIdentityCard() {
return identityCard;
}
public void setIdentityCard(String identityCard) {
this.identityCard = identityCard;
}
public Date getSubmissionDate() {
return submissionDate;
}
public void setSubmissionDate(Date submissionDate) {
this.submissionDate = submissionDate;
}
}