Commit bbdfe897 authored by Deep Dey's avatar Deep Dey

feat: add session year for backend apis along with additional filters

parent 47d06eac
......@@ -281,7 +281,10 @@ public class AdmissionFormController {
@RequestParam(required = false, defaultValue = "") String className,
@RequestParam(required = false, defaultValue = "") String interactionDate, // 2022-01-01
@RequestParam(required = false, defaultValue = "") String interactionTime,
@RequestParam(required = false, defaultValue = "") String correspondenceEmail// 10:00 AM
@RequestParam(required = false, defaultValue = "") String correspondenceEmail, // 10:00 AM
@RequestParam(required = false, defaultValue = "") String category,
@RequestParam(required = false, defaultValue = "") String religion,
@RequestParam(required = false, defaultValue = "") String sessionYear
) throws Exception {
// TODO: validation of api key using redis
......@@ -295,7 +298,10 @@ public class AdmissionFormController {
className,
interactionDate,
interactionTime,
correspondenceEmail
correspondenceEmail,
category,
religion,
sessionYear
)
),
HttpStatus.OK);
......@@ -406,6 +412,9 @@ public class AdmissionFormController {
interactionDate,
null,
null,
null,
null,
null,
null
);
......@@ -448,6 +457,9 @@ public class AdmissionFormController {
interactionDate,
null,
null,
null,
null,
null,
null
);
......@@ -490,6 +502,9 @@ public class AdmissionFormController {
interactionDate,
null,
null,
null,
null,
null,
null
);
......@@ -532,6 +547,9 @@ public class AdmissionFormController {
interactionDate,
null,
null,
null,
null,
null,
null
);
......@@ -582,7 +600,10 @@ public class AdmissionFormController {
null,
null,
null,
admissionDate
admissionDate,
null,
null,
null
);
if (admissionFormDataList.isEmpty()) {
......@@ -627,7 +648,10 @@ public class AdmissionFormController {
null,
null,
null,
admissionDate
admissionDate,
null,
null,
null
);
if (admissionFormDataList.isEmpty()) {
......@@ -664,7 +688,8 @@ public class AdmissionFormController {
@ApiOperation(value = "")
public Object getAdmissionFormsCount(
HttpServletRequest request,
@RequestHeader("apikey") String apiKey
@RequestHeader("apikey") String apiKey,
@RequestParam(required = false, defaultValue = "") String sessionYear
) throws Exception {
// TODO: validation of api key using redis
......@@ -673,7 +698,7 @@ public class AdmissionFormController {
true,
AppConstants.RESPONSE_SUCCESS_STATUS_CODE,
"Data Fetched Successfully",
this.admissionFormDAOController.getAdmissionFormCount()
this.admissionFormDAOController.getAdmissionFormCount(sessionYear)
),
HttpStatus.OK);
}
......
......@@ -104,7 +104,10 @@ public class AdmissionFormDAOController {
String interactionDate,
String interactionTime,
String correspondenceEmail,
String admissionDate
String admissionDate,
String category,
String religion,
String sessionYear
) {
return admissionFormDataRepository.getAdmissionFormDataList(
schoolName,
......@@ -112,7 +115,10 @@ public class AdmissionFormDAOController {
interactionDate,
interactionTime,
correspondenceEmail,
admissionDate
admissionDate,
category,
religion,
sessionYear
);
}
......@@ -121,14 +127,20 @@ public class AdmissionFormDAOController {
String className,
String interactionDate,
String interactionTime,
String correspondenceEmail
String correspondenceEmail,
String category,
String religion,
String sessionYear
) {
return admissionFormDataRepository.getAdmissionFormDataListPreview(
schoolName,
className,
interactionDate,
interactionTime,
correspondenceEmail
correspondenceEmail,
category,
religion,
sessionYear
);
}
......@@ -236,8 +248,8 @@ public class AdmissionFormDAOController {
return updated;
}
public AdmissionFormCount getAdmissionFormCount() {
return admissionFormDataRepository.getAdmissionFormCount();
public AdmissionFormCount getAdmissionFormCount(String sessionYear) {
return admissionFormDataRepository.getAdmissionFormCount(sessionYear);
}
public byte[] convertAdmissionFormToExcel(List<AdmissionFormData> admissionFormDataList, boolean showAdmission) throws Exception {
......
......@@ -56,7 +56,7 @@ public class AdmissionFormDataRepository {
"father_image_name, " +
"filled_by_admin, " +
"existing, " +
"mother_image_name) " +
"mother_image_name, session_year) " +
"VALUES (:school, :category, :fullName, :admissionClass, " +
":dateOfBirth, :nationality, :religion, :motherTongue, :community, " +
":otherChildren, :maritalStatus, " +
......@@ -85,7 +85,7 @@ public class AdmissionFormDataRepository {
":fatherImageName, " +
":filledByAdmin, " +
":existing, " +
":motherImageName)";
":motherImageName, :sessionYear)";
try {
MapSqlParameterSource params = new MapSqlParameterSource();
......@@ -147,6 +147,7 @@ public class AdmissionFormDataRepository {
params.addValue("motherImageName", formData.getMotherImageName());
params.addValue("filledByAdmin", formData.isFilledByAdmin());
params.addValue("existing", formData.isExisting());
params.addValue("sessionYear", formData.getSessionYear());
KeyHolder keyHolder = new GeneratedKeyHolder();
int cnt = namedParameterJdbcTemplate.update(sql, params, keyHolder);
......@@ -169,7 +170,10 @@ public class AdmissionFormDataRepository {
String className,
String interactionDate,
String interactionTime,
String correspondenceEmail
String correspondenceEmail,
String category,
String religion,
String sessionYear
) {
StringBuilder sql = new StringBuilder(
"""
......@@ -207,6 +211,19 @@ public class AdmissionFormDataRepository {
parameters.addValue("correspondenceEmail", correspondenceEmail);
}
if (category != null && !category.isEmpty()) {
sql.append(" AND afd.category = :category");
parameters.addValue("category", category);
}
if (religion != null && !religion.isEmpty()) {
sql.append(" AND afd.religion = :religion");
parameters.addValue("religion", religion);
}
if (sessionYear != null && !sessionYear.isEmpty()) {
sql.append(" AND afd.session_year = :sessionYear");
parameters.addValue("sessionYear", sessionYear);
}
sql.append(" ORDER BY afd.id ASC");
return namedParameterJdbcTemplate
......@@ -219,7 +236,10 @@ public class AdmissionFormDataRepository {
String interactionDate,
String interactionTime,
String correspondenceEmail,
String admissionDate
String admissionDate,
String category,
String religion,
String sessionYear
) {
StringBuilder sql = new StringBuilder(
"""
......@@ -261,6 +281,19 @@ public class AdmissionFormDataRepository {
parameters.addValue("admissionDate", admissionDate);
}
if (category != null && !category.isEmpty()) {
sql.append(" AND afd.category = :category");
parameters.addValue("category", category);
}
if (religion != null && !religion.isEmpty()) {
sql.append(" AND afd.religion = :religion");
parameters.addValue("religion", religion);
}
if (sessionYear != null && !sessionYear.isEmpty()) {
sql.append(" AND afd.session_year = :sessionYear");
parameters.addValue("sessionYear", sessionYear);
}
sql.append(" ORDER BY afd.id DESC");
return namedParameterJdbcTemplate
.query(sql.toString(), parameters, new AdmissionFormMapper());
......@@ -330,15 +363,20 @@ public class AdmissionFormDataRepository {
return rowsAffected > 0;
}
public AdmissionFormCount getAdmissionFormCount() {
public AdmissionFormCount getAdmissionFormCount(String sessionYear) {
String sql = """
SELECT
COUNT(CASE WHEN school = 'La Martiniere for Boys' THEN 1 END) AS LMBCount,
COUNT(CASE WHEN school = 'La Martiniere for Girls' THEN 1 END) AS LMGCount
FROM admission_form_data
FROM admission_form_data where 1=1
""";
MapSqlParameterSource parameters = new MapSqlParameterSource();
if (sessionYear != null && !sessionYear.isEmpty()) {
sql += " AND session_year = :sessionYear";
parameters.addValue("sessionYear", sessionYear);
}
return namedParameterJdbcTemplate
.queryForObject(sql, parameters, new AdmissionFormCountMapper());
}
......
......@@ -110,4 +110,7 @@ public class AdmissionFormData {
private boolean filledByAdmin;
private boolean existing;
private boolean provisional;
@NotEmpty(message = "Session Year cannot be empty")
private String sessionYear;
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment