Skip to content
Open
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
17 changes: 17 additions & 0 deletions JavaFinalProject.iml
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,25 @@
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<library name="JUnit5.8.1">
<CLASSES>
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter/5.8.1/junit-jupiter-5.8.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-api/5.8.1/junit-jupiter-api-5.8.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/opentest4j/opentest4j/1.2.0/opentest4j-1.2.0.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-commons/1.8.1/junit-platform-commons-1.8.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/apiguardian/apiguardian-api/1.1.2/apiguardian-api-1.1.2.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-params/5.8.1/junit-jupiter-params-5.8.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/jupiter/junit-jupiter-engine/5.8.1/junit-jupiter-engine-5.8.1.jar!/" />
<root url="jar://$MAVEN_REPOSITORY$/org/junit/platform/junit-platform-engine/1.8.1/junit-platform-engine-1.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
</library>
</orderEntry>
</component>
</module>
5 changes: 5 additions & 0 deletions src/com/generation/Main.java
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@ public static void main( String[] args )
}
}
while ( option != 6 );

}

private static void enrollStudentToCourse( StudentService studentService, CourseService courseService,
Expand Down Expand Up @@ -104,4 +105,8 @@ private static void registerStudent( StudentService studentService, Scanner scan
Student student = PrinterHelper.createStudentMenu( scanner );
studentService.subscribeStudent( student );
}




}
8 changes: 8 additions & 0 deletions src/com/generation/model/Student.java
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public Student( String id, String name, String email, Date birthDate )
public void enrollToCourse( Course course )
{
//TODO implement this method
courses.add(course); //adds a new course to end of course arraylist
}

public void registerApprovedCourse( Course course )
Expand All @@ -35,6 +36,13 @@ public void registerApprovedCourse( Course course )
public boolean isAttendingCourse( String courseCode )
{
//TODO implement this method

for (Course course : courses) {
if (courseCode.equalsIgnoreCase(course.getCode())) {
return true;
}
}

return false;
}

Expand Down
10 changes: 10 additions & 0 deletions src/com/generation/service/StudentService.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import com.generation.model.Student;

import java.util.HashMap;
import java.util.List;
import java.util.Map;

public class StudentService
Expand All @@ -27,6 +28,15 @@ public Student findStudent( String studentId )
public void showSummary()
{
//TODO implement

System.out.println( "Students:" );
for ( String key : students.keySet() ) //key is student id number value is object 5
{
Student student = students.get( key );//returns object and places it in student
System.out.println( student); //prints student
// System.out.println(student.isAttendingCourse("INTRO-WEB-1")); //tests if student is enrolled to this course
}

}

public void enrollToCourse( String studentId, Course course )
Expand Down
18 changes: 16 additions & 2 deletions src/com/generation/utils/PrinterHelper.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import java.text.DateFormat;
import java.text.ParseException;
import java.text.SimpleDateFormat;

import java.util.Date;
import java.util.Scanner;

Expand Down Expand Up @@ -38,9 +39,22 @@ public static Student createStudentMenu( Scanner scanner )
System.out.println( "| Enter student email: |" );
String email = scanner.next();
System.out.println( "| Enter student birth date(mm/dd/yyyy)|" );
DateFormat formatter = new SimpleDateFormat( "mm/dd/yyyy");
DateFormat formatter = new SimpleDateFormat( "MM/dd/yyyy");
//TODO validate date format and catch exception to avoid crash
Date birthDate = formatter.parse( scanner.next());
Date birthDate=null;
boolean validDate=false;

while(!validDate){
try{
birthDate = formatter.parse( scanner.next());
validDate=true;
} catch(ParseException error){
System.out.println("invalid date. Please enter a valid date");
}
}



System.out.println( "|-------------------------------------|" );
Student student = new Student( id, name, email, birthDate );
System.out.println( "Student Successfully Registered! " );
Expand Down
40 changes: 40 additions & 0 deletions test/com/generation/service/CourseServiceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
package com.generation.service;

import com.generation.model.Course;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;



class CourseServiceTest {

CourseService courseService = new CourseService();//create an object
Course course=new Course("1234","computer",4,null);

@Test
void registerCourse() {
courseService.registerCourse(course);
assertNotNull(courseService);
}

@Test
void getCourse() {
assertNull(courseService.getCourse("1234"));
}

@Test
void enrollStudent() {
}

@Test
void showEnrolledStudents() {
}

@Test
void showSummary() {

}


}
36 changes: 36 additions & 0 deletions test/com/generation/service/StudentServiceTest.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
package com.generation.service;

import com.generation.model.Course;
import com.generation.model.Student;
import org.junit.jupiter.api.Test;

import static org.junit.jupiter.api.Assertions.*;

class StudentServiceTest {

public StudentService studentService=new StudentService();
public Student student=new Student("1234","yvette","yvette@email.com",null);


@Test
void subscribeStudent() {
studentService.subscribeStudent(student); //adds student object
assertTrue(studentService!=null); //checkks that student service is not null
}

@Test
void findStudent() {
assertNull(studentService.findStudent("1234"));

}

@Test
void showSummary() {

}

@Test
void enrollToCourse() {

}
}