Skip to content

Commit

Permalink
Merge pull request #450 from bcgov/develop/alex-GRAD2-2366
Browse files Browse the repository at this point in the history
Develop/alex grad2 2366
  • Loading branch information
infstar authored Oct 19, 2023
2 parents 55c7416 + dd99491 commit 85d6f90
Show file tree
Hide file tree
Showing 90 changed files with 474 additions and 560 deletions.
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;

@Data
@Component
public class AlgorithmRuleCode {
public class AlgorithmRuleCode implements Serializable {

private String algoRuleCode;
private String ruleImplementation;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.sql.Date;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.sql.Date;

@Data
@Component
public class Assessment {
public class Assessment implements Serializable {

private String assessmentCode;
private String assessmentName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class AssessmentRequirement {
public class AssessmentRequirement implements Serializable {

private UUID assessmentRequirementId;
private String assessmentCode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.sql.Date;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.sql.Date;

@Data
@Component
public class AssessmentRequirementCode {
public class AssessmentRequirementCode implements Serializable {

private String assmtRequirementCode;
private String label;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class CourseRequirement {
public class CourseRequirement implements Serializable {

private UUID courseRequirementId;
private String courseCode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.sql.Date;

import org.springframework.stereotype.Component;

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

import java.io.Serializable;
import java.sql.Date;

@Data
@EqualsAndHashCode(callSuper = false)
@Component
public class CourseRequirementCodeDTO {
public class CourseRequirementCodeDTO implements Serializable {
private String courseRequirementCode;
private String label;
private String description;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import lombok.Data;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.util.List;

@Data
@Component
public class CourseRequirements {
public class CourseRequirements implements Serializable {
List<CourseRequirement> courseRequirementList;
}
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class CourseRestriction {
public class CourseRestriction implements Serializable {

private UUID courseRestrictionId;
private String mainCourse;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import lombok.Data;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.sql.Date;
import java.util.UUID;

import org.springframework.stereotype.Component;

@Data
@Component
public class GradAlgorithmGraduationStatus {
public class GradAlgorithmGraduationStatus implements Serializable {

private String pen;
private String program;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class GradProgramRule {
public class GradProgramRule implements Serializable {

private UUID id;
private String ruleCode;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
import lombok.Data;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.util.List;

@Component
@Data
public class GradProgramRules {
public class GradProgramRules implements Serializable {
List<GradProgramRule> gradProgramRuleList;
}
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,14 @@
import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.util.Objects;

@Component
@Data
@NoArgsConstructor
@AllArgsConstructor
public class GradRequirement {
public class GradRequirement implements Serializable {
String transcriptRule;
String description;
String rule;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,11 +5,13 @@
import lombok.NoArgsConstructor;
import lombok.experimental.SuperBuilder;

import java.io.Serializable;

@Data
@SuperBuilder
@AllArgsConstructor
@NoArgsConstructor
public class GradSearchStudent {
public class GradSearchStudent implements Serializable {

private String studentID;
private String pen;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
import lombok.NoArgsConstructor;
import org.springframework.stereotype.Component;

import java.io.Serializable;

/**
* The type for Grad Student.
*/
Expand All @@ -14,7 +16,7 @@
@Builder
@AllArgsConstructor
@NoArgsConstructor
public class GradStudent {
public class GradStudent implements Serializable {
private String pen;
private String archiveFlag;
private String studSurname;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.Date;

import org.springframework.stereotype.Component;

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

import java.io.Serializable;
import java.util.Date;

@Data
@EqualsAndHashCode(callSuper=false)
@Component
public class GraduationProgramCode {
public class GraduationProgramCode implements Serializable {

private String programCode;
private String programName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;

@Data
@Component
public class LetterGrade {
public class LetterGrade implements Serializable {

private String grade;
private String gpaMarkValue;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.List;
import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.List;
import java.util.UUID;

@Data
@Component
public class OptionalGradAlgorithmGraduationStatus {
public class OptionalGradAlgorithmGraduationStatus implements Serializable {

private String pen;
private UUID optionalProgramID;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.Date;
import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.Date;
import java.util.UUID;

@Data
@Component
public class OptionalProgram {
public class OptionalProgram implements Serializable {

private UUID optionalProgramID;
private String optProgramCode;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class OptionalProgramRequirement {
public class OptionalProgramRequirement implements Serializable {

private UUID optionalProgramRequirementID;
private OptionalProgram optionalProgramID;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;

@Data
@Component
public class OptionalProgramRequirementCode {
public class OptionalProgramRequirementCode implements Serializable {

private String optProReqCode;
private String label;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,12 +3,13 @@
import lombok.Data;
import org.springframework.stereotype.Component;

import java.io.Serializable;
import java.util.List;
import java.util.UUID;

@Data
@Component
public class OptionalProgramRuleProcessor {
public class OptionalProgramRuleProcessor implements Serializable {

private UUID optionalProgramID;

Expand Down
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package ca.bc.gov.educ.api.ruleengine.dto;

import java.util.UUID;

import lombok.Data;
import org.springframework.stereotype.Component;

import lombok.Data;
import java.io.Serializable;
import java.util.UUID;

@Data
@Component
public class ProgramAlgorithmRule {
public class ProgramAlgorithmRule implements Serializable {

private UUID programAlgoRuleID;
private String graduationProgramCode;
Expand Down
Loading

0 comments on commit 85d6f90

Please sign in to comment.