Commit b12c032e authored by Deep Dey's avatar Deep Dey

feat: add new column to identify duplicate father email

parent 0e6e7080
...@@ -29,7 +29,7 @@ public class AdmissionFormDAOController { ...@@ -29,7 +29,7 @@ public class AdmissionFormDAOController {
public boolean addNewAdmissionData(@NotNull AdmissionFormData formData) throws Exception { public boolean addNewAdmissionData(@NotNull AdmissionFormData formData) throws Exception {
if (formData.isCheckFatherEmail()) { if (!formData.isDuplicateFatherEmail()) {
List<AdmissionFormData> data = admissionFormDataRepository List<AdmissionFormData> data = admissionFormDataRepository
.getAdmissionFormDataByEmail(formData.getFatherEmail()); .getAdmissionFormDataByEmail(formData.getFatherEmail());
......
...@@ -47,7 +47,7 @@ public class AdmissionFormDataRepository { ...@@ -47,7 +47,7 @@ public class AdmissionFormDataRepository {
"father_church, " + "father_church, " +
"mother_denomination, " + "mother_denomination, " +
"mother_church, " + "mother_church, " +
// end newly added fields // end newly added fields
"candidate_image_name, " + "candidate_image_name, " +
"father_image_name, " + "father_image_name, " +
"mother_image_name) " + "mother_image_name) " +
...@@ -161,27 +161,39 @@ public class AdmissionFormDataRepository { ...@@ -161,27 +161,39 @@ public class AdmissionFormDataRepository {
String interactionTime, String interactionTime,
String correspondenceEmail String correspondenceEmail
) { ) {
StringBuilder sql = new StringBuilder("SELECT * FROM admission_form_data WHERE 1 = 1"); StringBuilder sql = new StringBuilder(
"""
SELECT afd.*,
CASE
WHEN email_count > 1 THEN true
ELSE false
END AS is_duplicate
FROM admission_form_data afd
JOIN (SELECT father_email,
COUNT(*) AS email_count
FROM admission_form_data
GROUP BY father_email) email_counts
ON afd.father_email = email_counts.father_email WHERE 1 = 1""");
MapSqlParameterSource parameters = new MapSqlParameterSource(); MapSqlParameterSource parameters = new MapSqlParameterSource();
if (schoolName != null && !schoolName.isEmpty()) { if (schoolName != null && !schoolName.isEmpty()) {
sql.append(" AND school = :schoolName"); sql.append(" AND afd.school = :schoolName");
parameters.addValue("schoolName", schoolName); parameters.addValue("schoolName", schoolName);
} }
if (className != null && !className.isEmpty()) { if (className != null && !className.isEmpty()) {
sql.append(" AND admission_class = :className"); sql.append(" AND afd.admission_class = :className");
parameters.addValue("className", className); parameters.addValue("className", className);
} }
if (interactionDate != null && !interactionDate.isEmpty()) { if (interactionDate != null && !interactionDate.isEmpty()) {
sql.append(" AND interaction_date = :interactionDate"); sql.append(" AND afd.interaction_date = :interactionDate");
parameters.addValue("interactionDate", interactionDate); parameters.addValue("interactionDate", interactionDate);
} }
if (interactionTime != null && !interactionTime.isEmpty()) { if (interactionTime != null && !interactionTime.isEmpty()) {
sql.append(" AND interaction_time = :interactionTime"); sql.append(" AND afd.interaction_time = :interactionTime");
parameters.addValue("interactionTime", interactionTime); parameters.addValue("interactionTime", interactionTime);
} }
if (correspondenceEmail != null && !correspondenceEmail.isEmpty()) { if (correspondenceEmail != null && !correspondenceEmail.isEmpty()) {
sql.append(" AND father_email = :correspondenceEmail"); sql.append(" AND afd.father_email = :correspondenceEmail");
parameters.addValue("correspondenceEmail", correspondenceEmail); parameters.addValue("correspondenceEmail", correspondenceEmail);
} }
return namedParameterJdbcTemplate return namedParameterJdbcTemplate
...@@ -189,7 +201,7 @@ public class AdmissionFormDataRepository { ...@@ -189,7 +201,7 @@ public class AdmissionFormDataRepository {
} }
public List<AdmissionFormData> getAdmissionFormDataListByIds(List<Long> ids) { public List<AdmissionFormData> getAdmissionFormDataListByIds(List<Long> ids) {
String sql = "SELECT * FROM admission_form_data WHERE id IN (:ids)"; String sql = "SELECT *, false as is_duplicate FROM admission_form_data WHERE id IN (:ids)";
MapSqlParameterSource parameters = new MapSqlParameterSource(); MapSqlParameterSource parameters = new MapSqlParameterSource();
parameters.addValue("ids", ids); parameters.addValue("ids", ids);
...@@ -198,7 +210,7 @@ public class AdmissionFormDataRepository { ...@@ -198,7 +210,7 @@ public class AdmissionFormDataRepository {
} }
public AdmissionFormData getAdmissionFormDataById(Long formId) { public AdmissionFormData getAdmissionFormDataById(Long formId) {
String sql = "SELECT * FROM admission_form_data WHERE id = :id"; String sql = "SELECT *, false as is_duplicate FROM admission_form_data WHERE id = :id";
MapSqlParameterSource parameters = new MapSqlParameterSource(); MapSqlParameterSource parameters = new MapSqlParameterSource();
parameters.addValue("id", formId); parameters.addValue("id", formId);
...@@ -208,7 +220,7 @@ public class AdmissionFormDataRepository { ...@@ -208,7 +220,7 @@ public class AdmissionFormDataRepository {
} }
public List<AdmissionFormData> getAdmissionFormDataByEmail(String email) { public List<AdmissionFormData> getAdmissionFormDataByEmail(String email) {
String sql = "SELECT * FROM admission_form_data WHERE father_email = :email"; String sql = "SELECT *, false as is_duplicate FROM admission_form_data WHERE father_email = :email";
MapSqlParameterSource parameters = new MapSqlParameterSource(); MapSqlParameterSource parameters = new MapSqlParameterSource();
parameters.addValue("email", email); parameters.addValue("email", email);
......
...@@ -78,6 +78,7 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> { ...@@ -78,6 +78,7 @@ public class AdmissionFormMapper implements RowMapper<AdmissionFormData> {
formData.setFatherChurch(RowMapperUtil.getString(rs, "father_church")); formData.setFatherChurch(RowMapperUtil.getString(rs, "father_church"));
formData.setMotherDenomination(RowMapperUtil.getString(rs, "mother_denomination")); formData.setMotherDenomination(RowMapperUtil.getString(rs, "mother_denomination"));
formData.setMotherChurch(RowMapperUtil.getString(rs, "mother_church")); formData.setMotherChurch(RowMapperUtil.getString(rs, "mother_church"));
formData.setDuplicateFatherEmail(rs.getBoolean("is_duplicate"));
// end newly added fields // end newly added fields
return formData; return formData;
......
...@@ -103,5 +103,5 @@ public class AdmissionFormData { ...@@ -103,5 +103,5 @@ public class AdmissionFormData {
private String interactionDate; private String interactionDate;
private String interactionTime; private String interactionTime;
private boolean checkFatherEmail; private boolean duplicateFatherEmail;
} }
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