Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

GRAD2-2761: initial commit to utilize the school clob data from institute RedisCache in grad-trax-api. #549

Merged
merged 2 commits into from
Nov 4, 2024
Merged
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
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
package ca.bc.gov.educ.api.graduation.model.dto;

import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component;

@Data
@EqualsAndHashCode(callSuper = true)
@Component
@NoArgsConstructor
@AllArgsConstructor
public class District extends BaseModel {

private String districtId;
private String districtNumber;
private String faxNumber;
private String phoneNumber;
private String email;
private String website;
private String displayName;
private String districtRegionCode;
private String districtStatusCode;

public String getDistrictName() {
return displayName;
}
}

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@ public class GradAlgorithmGraduationStudentRecord {
private String honoursStanding;
private String recalculateGradStatus;
private String schoolOfRecord;
private UUID schoolOfRecordId;
private String studentGrade;
private String studentStatus;
private String studentCitizenship;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class GraduationStudentRecord extends BaseModel {
private String honoursStanding;
private String recalculateGradStatus;
private String schoolOfRecord;
private UUID schoolOfRecordId;
private String schoolName;
private String studentGrade;
private String studentStatus;
Expand Down
102 changes: 25 additions & 77 deletions api/src/main/java/ca/bc/gov/educ/api/graduation/model/dto/School.java
Original file line number Diff line number Diff line change
Expand Up @@ -8,41 +8,29 @@
public class School {

private String minCode;
private String schoolName;
private String districtName;
private String schoolCategoryCode;
private String transcriptEligibility;
private String certificateEligibility;
private String independentDesignation;
private String mailerType;
private String address1;
private String address2;
private String city;
private String provCode;
private String provinceName;
private String countryCode;
private String countryName;
private String postal;
private String independentAffiliation;
private String openFlag;
private String signatureDistrict;
private String newMinCode;
private String schoolOrg;
private String appendTrans;
private String ministryContact;
private String principalName;
private String schoolPhone;
private String schoolFax;
private String schoolEmail;

private String schoolId;
private String schoolName;
private String districtName;
private String transcriptEligibility;
private String certificateEligibility;
private String address1;
private String address2;
private String city;
private String provCode;
private String countryCode;
private String postal;
private String openFlag;
private String schoolCategoryCode;
private String schoolCategoryCodeInstitute;

public String getSchoolName() {
return schoolName != null ? schoolName.trim(): null;
}

public String getDistrictName() {
return districtName != null ? districtName.trim(): null;
}

public String getAddress1() {
return address1 != null ? address1.trim(): null;
}
Expand All @@ -55,61 +43,21 @@ public String getCity() {
return city != null ? city.trim(): null;
}

public String getProvinceName() {
return provinceName != null ? provinceName.trim(): null;
}

public String getCountryName() {
return countryName != null ? countryName.trim(): null;
}

public String getPostal() {
return postal != null ? postal.trim(): null;
}

public String getIndependentDesignation() {
return independentDesignation != null ? independentDesignation.trim(): null;
}

public String getIndependentAffiliation() {
return independentAffiliation != null ? independentAffiliation.trim(): null;
}


public String getOpenFlag() {
return openFlag != null ? openFlag.trim(): null;
}

public String getSignatureDistrict() {
return signatureDistrict != null ? signatureDistrict.trim(): null;
}

public String getSchoolEmail() {
return schoolEmail != null ? schoolEmail.trim(): null;
}

public String getPrincipalName() {
return principalName != null ? principalName.trim(): null;
}

public String getAppendTrans() {
return appendTrans != null ? appendTrans.trim(): null;
}

public String getMinistryContact() {
return ministryContact != null ? ministryContact.trim(): null;
}

@Override
public String toString() {
return "School [minCode=" + minCode + ", schoolName=" + schoolName + ", districtName=" + districtName
+ ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility="
+ certificateEligibility + ", independentDesignation=" + independentDesignation + ", mailerType="
+ mailerType + ", address1=" + address1 + ", address2=" + address2 + ", city=" + city + ", provCode="
+ provCode + ", provinceName=" + provinceName + ", countryCode=" + countryCode + ", countryName="
+ countryName + ", postal=" + postal + ", independentAffiliation=" + independentAffiliation
+ ", openFlag=" + openFlag + ", signatureDistrict=" + signatureDistrict + ", newMinCode=" + newMinCode
+ ", schoolOrg=" + schoolOrg + ", appendTrans=" + appendTrans + ", ministryContact=" + ministryContact
+ ", principalName=" + principalName + ", schoolPhone=" + schoolPhone + ", schoolFax=" + schoolFax
+ ", schoolEmail=" + schoolEmail + "]";
}
return "School [minCode=" + minCode + ", schoolId=" + schoolId + ", schoolCategoryCode=" + schoolCategoryCode + ", schoolCategoryCodeInstitute=" + schoolCategoryCodeInstitute
+ ", schoolName=" + schoolName + ", districtName=" + districtName + ", transcriptEligibility=" + transcriptEligibility + ", certificateEligibility=" + certificateEligibility
+ ", address1=" + address1 + ", address2=" + address2 + ", city=" + city + ", provCode=" + provCode + ", countryCode=" + countryCode + ", postal=" + postal + ", openFlag=" + openFlag
+ "]";
}

}

This file was deleted.

Loading
Loading