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.

Sign up for GitHub

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

Jump to bottom

Grad release 1.19.0 #262

Merged
merged 6 commits into from
May 23, 2024
Merged

Grad release 1.19.0 #262

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d42b271
Upgrade ZAPSCAN to 0.7.0 (#258)
kamal-mohammed Apr 23, 2024
b8b80c1
Update pom.xml
githubmamatha Apr 24, 2024
e48a88e
Grad2-2632 school api call is replaced with trax api. (#260)
githubmamatha May 10, 2024
7105df4
Update pom.xml
githubmamatha May 23, 2024
258c277
Merge branch 'main' into grad-release
githubmamatha May 23, 2024
9ad080c
Update SchoolService.java
githubmamatha May 23, 2024
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
2 changes: 1 addition & 1 deletion api/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>ca.bc.gov.educ</groupId>
<artifactId>educ-grad-distribution-api</artifactId>
<version>1.8.59</version>
<version>1.8.60</version>
<name>educ-grad-distribution-api</name>
<description>Ministry of Education GRAD DISTRIBUTION API</description>

Expand Down
5 changes: 1 addition & 4 deletions api/src/main/java/ca/bc/gov/educ/api/distribution/service/SchoolService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,12 @@
import ca.bc.gov.educ.api.distribution.util.RestUtils;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.StringUtils;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;

@Service
public class SchoolService {

private static Logger logger = LoggerFactory.getLogger(SchoolService.class);
RestUtils restUtils;
RestService restService;
EducDistributionApiConstants educDistributionApiConstants;
Expand All @@ -35,7 +32,7 @@ public CommonSchool getCommonSchoolDetails(String mincode, ExceptionMessage exce
mincode
);
} catch (Exception e) {
exception.setExceptionName("SCHOOL-API IS DOWN");
exception.setExceptionName(EducDistributionApiConstants.TRAX_API_STATUS);
exception.setExceptionDetails(e.getLocalizedMessage());
}
return commonSchool;
Expand Down
4 changes: 3 additions & 1 deletion api/src/main/java/ca/bc/gov/educ/api/distribution/util/EducDistributionApiConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,8 @@ public class EducDistributionApiConstants {
public static final String ASSESSMENT_LTE = "LTE10";
public static final String ASSESSMENT_LTP = "LTP10";

public static final String TRAX_API_STATUS = "TRAX-API IS DOWN";

@Value("${endpoint.grad-graduation-report-api.get-transcript-list.url}")
private String transcriptDistributionList;

Expand Down Expand Up @@ -92,7 +94,7 @@ public class EducDistributionApiConstants {
@Value("${endpoint.keycloak.getToken}")
private String tokenUrl;

@Value("${endpoint.educ-school-api.school-by-min-code.url}")
@Value("${endpoint.grad-trax-api.commonschool-by-mincode.url}")
private String commonSchoolByMincode;

@Value("${endpoint.grad-trax-api.psi-by-psi-code.url}")
Expand Down
7 changes: 4 additions & 3 deletions api/src/main/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,16 +143,17 @@ endpoint:
url: ${GRAD_GRADUATION_API}api/v1/graduate/report/schooldistrictsupp?slrt=%s&drt=%s&srt=%s
school_labels_report:
url: ${GRAD_GRADUATION_API}api/v1/graduate/report/school/labels?reportType=%s
educ-school-api:
school-by-min-code:
url: ${EDUC_SCHOOL_API}api/v1/schools/%s


grad-trax-api:
psi-by-psi-code:
url: ${GRAD_TRAX_API}api/v1/trax/psi/%s
school-by-min-code:
url: ${GRAD_TRAX_API}api/v1/trax/school/%s
district-by-dist-code:
url: ${GRAD_TRAX_API}api/v1/trax/district/%s
commonschool-by-mincode:
url: ${GRAD_TRAX_API}api/v1/trax/school/common/%s
grad-batch-graduation-api:
distribution:
notify-completion:
Expand Down
2 changes: 1 addition & 1 deletion api/src/test/java/ca/bc/gov/educ/api/distribution/service/SchoolServiceTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ public void testGetCommonSchoolDetails_Exception() {

var response = this.schoolService.getCommonSchoolDetails("234567", exceptionMessage);
Assert.assertNull(response);
Assert.assertEquals("SCHOOL-API IS DOWN", exceptionMessage.getExceptionName());
Assert.assertEquals(EducDistributionApiConstants.TRAX_API_STATUS, exceptionMessage.getExceptionName());
}

@Test
Expand Down
6 changes: 3 additions & 3 deletions api/src/test/resources/application.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,16 +146,16 @@ endpoint:
url: https://educ-grad-graduation-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/graduate/report/schooldistrictsupp?slrt=%s&drt=%s&srt=%s
school_labels_report:
url: https://educ-grad-graduation-api-77c02f-dev.apps.silver.devops.gov.bc.caapi/v1/graduate/report/school/labels?reportType=%s
educ-school-api:
school-by-min-code:
url: https://educ-school-api-75e61b-dev.apps.silver.devops.gov.bc.ca/api/v1/schools/%s

grad-trax-api:
psi-by-psi-code:
url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/psi/%s
school-by-min-code:
url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/school/%s
district-by-dist-code:
url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/district/%s
commonschool-by-mincode:
url: https://educ-grad-trax-api-77c02f-dev.apps.silver.devops.gov.bc.ca/api/v1/trax/school/common/%s
grad-batch-graduation-api:
distribution:
notify-completion:
Expand Down
Loading