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

EAC:40: Changes to expose validation codes through endpoint. #76

Closed
wants to merge 1 commit into from
Closed
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
Expand Up @@ -16,6 +16,7 @@ private URL(){
public static final String ASSESSMENT_TYPE_CODE_URL = BASE_URL + "/assessment-types";
public static final String PROVINCIAL_SPECIALCASE_CODE_URL = BASE_URL + "/assessment-specialcase-types";
public static final String ASSESSMENTS_URL = BASE_URL + "/assessments";
public static final String VALIDATION_ISSUE_TYPE_CODE_URL = BASE_URL + "/assessment-validation-issue-types";


}
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,15 @@

import ca.bc.gov.educ.eas.api.endpoint.v1.CodeTableAPIEndpoint;
import ca.bc.gov.educ.eas.api.mappers.v1.CodeTableMapper;
import ca.bc.gov.educ.eas.api.rules.assessment.AssessmentStudentValidationIssueTypeCode;
import ca.bc.gov.educ.eas.api.service.v1.CodeTableService;
import ca.bc.gov.educ.eas.api.struct.v1.AssessmentTypeCode;
import ca.bc.gov.educ.eas.api.struct.v1.ProvincialSpecialCaseCode;
import ca.bc.gov.educ.eas.api.struct.v1.ValidationIssueTypeCode;
import lombok.AllArgsConstructor;
import org.springframework.web.bind.annotation.RestController;

import java.util.ArrayList;
import java.util.List;

@RestController
Expand All @@ -26,4 +29,19 @@ public List<AssessmentTypeCode> getAssessTypeCodes() {
public List<ProvincialSpecialCaseCode> getProvincialSpecialCaseCodes() {
return codeTableService.getAllProvincialSpecialCaseCodes().stream().map(mapper::toStructure).toList();
}

@Override
public List<ValidationIssueTypeCode> getAssessmentStudentValidationIssueTypeCodes() {
List<ValidationIssueTypeCode> validationIssues = new ArrayList<>();

for (var code : AssessmentStudentValidationIssueTypeCode.values()) {
ValidationIssueTypeCode issue = new ValidationIssueTypeCode();
issue.setValidationIssueTypeCode(code.getCode());
issue.setMessage(code.getMessage());

validationIssues.add(issue);
}

return validationIssues;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import ca.bc.gov.educ.eas.api.constants.v1.URL;
import ca.bc.gov.educ.eas.api.struct.v1.AssessmentTypeCode;
import ca.bc.gov.educ.eas.api.struct.v1.ProvincialSpecialCaseCode;
import ca.bc.gov.educ.eas.api.struct.v1.ValidationIssueTypeCode;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
Expand All @@ -24,4 +25,10 @@ public interface CodeTableAPIEndpoint {
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
@Schema(name = "AssessmentTypeCode", implementation = AssessmentTypeCode.class)
List<ProvincialSpecialCaseCode> getProvincialSpecialCaseCodes();

@PreAuthorize("hasAuthority('SCOPE_READ_EAS_SESSIONS')")
@GetMapping(URL.VALIDATION_ISSUE_TYPE_CODE_URL)
@ApiResponses(value = {@ApiResponse(responseCode = "200", description = "OK")})
@Schema(name = "AssessmentTypeCode", implementation = ValidationIssueTypeCode.class)
List<ValidationIssueTypeCode> getAssessmentStudentValidationIssueTypeCodes();
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
package ca.bc.gov.educ.eas.api.struct.v1;


import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
import lombok.NoArgsConstructor;

import java.io.Serializable;

@Data
@AllArgsConstructor
@NoArgsConstructor
@Builder
@SuppressWarnings("squid:S1700")
public class ValidationIssueTypeCode implements Serializable {
private static final long serialVersionUID = 6118916290604876032L;

private String validationIssueTypeCode;
private String message;
private String severityTypeCode;
}

Original file line number Diff line number Diff line change
Expand Up @@ -54,5 +54,13 @@ void test_getProvincialSpecialCaseCodes_WithValidScope_ShouldReturnOK() throws E
.andExpect(status().isOk());
}

@Test
void test_getValidationIssueTypeCdes_WithValidScope_ShouldReturnOK() throws Exception {
final GrantedAuthority grantedAuthority = () -> "SCOPE_READ_EAS_SESSIONS";
final SecurityMockMvcRequestPostProcessors.OidcLoginRequestPostProcessor mockAuthority = oidcLogin().authorities(grantedAuthority);
this.mockMvc.perform(get(URL.VALIDATION_ISSUE_TYPE_CODE_URL).with(mockAuthority))
.andDo(print())
.andExpect(status().isOk());
}

}
Loading