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

Develop #13

Open
wants to merge 127 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
3f0dff8
original commit
estefaniaemburse Feb 24, 2024
044a835
Creation of schema
katalin-jordans Feb 24, 2024
db916f3
Merge pull request #1 from ainafetse22/schema
ivandavid858 Feb 24, 2024
6de7e6a
added logic in generateSerialId method
katalin-jordans Feb 24, 2024
eb488f7
add constructor to class course
estefaniaemburse Feb 24, 2024
81961cf
Merge pull request #2 from ainafetse22/generateId
ainafetse22 Feb 24, 2024
96b4702
utils should be static
estefaniaemburse Feb 24, 2024
51afe70
add person constructor
estefaniaemburse Feb 24, 2024
e28643c
Merge pull request #3 from ainafetse22/person_class
katalin-jordans Feb 24, 2024
e162170
Merge remote-tracking branch 'origin/develop' into course_class
estefaniaemburse Feb 24, 2024
35ffc12
bug fix Person constructor and courses class
estefaniaemburse Feb 24, 2024
6d9fe7f
course is not a child of person
estefaniaemburse Feb 24, 2024
eafab77
Merge pull request #5 from ainafetse22/course_class
katalin-jordans Feb 24, 2024
24afc1d
constructor creation for student
estefaniaemburse Feb 24, 2024
64cdf85
Merge pull request #6 from ainafetse22/student_class
katalin-jordans Feb 24, 2024
cc17609
Create teacher constructor
ivandavid858 Feb 24, 2024
3cb3920
Modify setSalary
ivandavid858 Feb 24, 2024
b77199c
Merge pull request #7 from ainafetse22/constructor_teacher
ainafetse22 Feb 24, 2024
1bc2e65
Addition of logic in lookup methods
katalin-jordans Feb 24, 2024
f6d28c5
Merge remote-tracking branch 'origin/develop' into school_lookups
katalin-jordans Feb 24, 2024
24b4418
Addition of logic in show methods
katalin-jordans Feb 24, 2024
7fb0b7a
Merge pull request #8 from ainafetse22/school_lookups
ainafetse22 Feb 24, 2024
7d31b31
Addition of calculateProfit method
katalin-jordans Feb 24, 2024
8b92b55
Merge pull request #9 from ainafetse22/school_lookups
ivandavid858 Feb 24, 2024
bb5a33b
change list to map
estefaniaemburse Feb 27, 2024
0c87980
handling case is null
estefaniaemburse Feb 27, 2024
958363e
create school from csv
estefaniaemburse Feb 27, 2024
fbdb33f
csv dummy info
estefaniaemburse Feb 27, 2024
55524a0
read info from csv
estefaniaemburse Feb 27, 2024
c06e982
Enum form type of entity
estefaniaemburse Feb 27, 2024
0a3dd4d
Merge pull request #10 from ainafetse22/school_implementation
katalin-jordans Feb 27, 2024
73179b8
Added salary validation
katalin-jordans Feb 29, 2024
611e6a3
Merge pull request #11 from ainafetse22/teacherValidation
katalin-jordans Feb 29, 2024
c3a1b50
Revert "Added salary validation"
katalin-jordans Feb 29, 2024
fffebfb
Merge pull request #12 from ainafetse22/revert-11-teacherValidation
katalin-jordans Feb 29, 2024
53e4e5b
Added salary validation
katalin-jordans Feb 29, 2024
9ac6bd9
Added salary validation
katalin-jordans Feb 29, 2024
6c2774f
Merge branch 'develop' into teacher_validation
katalin-jordans Feb 29, 2024
9a9ccc5
added salary validation
katalin-jordans Feb 29, 2024
ac1a589
Merge pull request #13 from ainafetse22/teacher_validation
ainafetse22 Feb 29, 2024
f6d9a96
Create enroll method to enroll a student to a course
ivandavid858 Feb 29, 2024
c5b068c
Merge pull request #14 from ainafetse22/method_enroll_student_to_course
katalin-jordans Feb 29, 2024
588ac88
Updated assignTeacherToCourse method
katalin-jordans Feb 29, 2024
1c59d27
Merge pull request #16 from ainafetse22/assign_teacher2
ainafetse22 Feb 29, 2024
b29e145
move create school to ReadCsvInfo
estefaniaemburse Feb 29, 2024
3a39d79
validate_number_of method
estefaniaemburse Feb 29, 2024
2f2f7e3
menu creation
estefaniaemburse Feb 29, 2024
1cd96f0
Create method to show students enrolled to a course
ivandavid858 Mar 5, 2024
8a978d5
Fix setMoney setMoney_earnet method
ivandavid858 Mar 5, 2024
28646b5
Create method showMoneySpentByStudent
ivandavid858 Mar 5, 2024
282d49f
updated lookup methods to print info
lausaru Mar 9, 2024
ad2c586
Merge commit '1c59d277bb50fe8e5dff3987fb097c6ff01f2b85' into menu_cre…
estefaniaemburse Mar 9, 2024
3dc980b
removed lookup methods testing from App
lausaru Mar 9, 2024
8c6b10c
Merge branch 'develop' into method_enroll_student_to_course
lausaru Mar 9, 2024
2d8fa8a
Merge pull request #18 from ainafetse22/method_enroll_student_to_course
lausaru Mar 9, 2024
e77e6d5
Merge pull request #22 from ainafetse22/update_lookup_methods
ainafetse22 Mar 9, 2024
d773bde
teacher course and students creation method
estefaniaemburse Mar 9, 2024
f08a2f9
exchanged throwing exception for print
lausaru Mar 9, 2024
83c0054
Merge remote-tracking branch 'origin/develop' into menu_creation
estefaniaemburse Mar 9, 2024
088ca37
add condition more than 0
estefaniaemburse Mar 9, 2024
4e5dffc
Merge pull request #24 from ainafetse22/menu_creation
lausaru Mar 9, 2024
71d17be
Add Validate Email util and update Student.java email validation
DJH23 Mar 9, 2024
faf9b04
first testing methods implemented
lausaru Mar 12, 2024
c88bbf8
Merge branch 'develop' into validation_new
ainafetse22 Mar 12, 2024
dfdfa08
Merge pull request #25 from ainafetse22/validation_new
ainafetse22 Mar 12, 2024
f61e1e0
Merge pull request #19 from ainafetse22/money_spent
ainafetse22 Mar 12, 2024
b030f6c
revert changes
estefaniaemburse Mar 12, 2024
8af4890
Merge branch 'develop' into show_students_by_course_id
ainafetse22 Mar 12, 2024
c04b68d
Merge pull request #17 from ainafetse22/show_students_by_course_id
ainafetse22 Mar 12, 2024
32bb7a5
Add exception rules to calculateProfit in School.java and add testing…
DJH23 Mar 12, 2024
1f94bce
Change throw to system out in calculateProfit
DJH23 Mar 12, 2024
9e14fa8
testing implementation v2.0
lausaru Mar 12, 2024
4d2483e
validation added to menu
estefaniaemburse Mar 12, 2024
4144a48
Merge pull request #28 from ainafetse22/menu_integration
ainafetse22 Mar 12, 2024
96abb68
revert files pom and workspace
estefaniaemburse Mar 12, 2024
730e62d
Merge pull request #26 from ainafetse22/school_implementation
ainafetse22 Mar 12, 2024
20cee24
resolved conflicts
lausaru Mar 12, 2024
35f13f3
Merge branch 'develop' into testing
lausaru Mar 12, 2024
8dba769
Merge pull request #27 from ainafetse22/testing
ainafetse22 Mar 12, 2024
1e4748c
commands creation
estefaniaemburse Mar 12, 2024
04585d1
Create method Creste test for method showMoneySpentByStudent
ivandavid858 Mar 12, 2024
aedb251
Add validation to createInstance in ReadCsvInfo as well as testing
DJH23 Mar 12, 2024
5fcb5ab
Create test for method findMoneySpentByStudent
ivandavid858 Mar 13, 2024
a926f14
commands creation
estefaniaemburse Mar 13, 2024
994ac7f
Merge pull request #30 from ainafetse22/command_integration_2
ainafetse22 Mar 13, 2024
3f670ae
Refactor to reuse code in SchoolTest class
ivandavid858 Mar 13, 2024
84004a1
Refactor to reuse code in SchoolTest class and create test for enroll…
ivandavid858 Mar 13, 2024
c7c51be
Merge remote-tracking branch 'origin/develop' into ReadCsvInfo
DJH23 Mar 13, 2024
a8e7297
Merge updates from develop and recommit
DJH23 Mar 13, 2024
6700c3e
Merge updates from develop, add lookupTeacher validation, and testing
DJH23 Mar 13, 2024
a05a5d7
Add showTeachers validation, and testing
DJH23 Mar 13, 2024
7d06554
Add lookupCourse validation, and testing
DJH23 Mar 13, 2024
23c1663
Add showCourses validation, and testing
DJH23 Mar 13, 2024
732b057
Add setListToTeacherMap validation, and testing
DJH23 Mar 13, 2024
b8d4d3a
Add setListToCourseMap validation, and testing
DJH23 Mar 13, 2024
9d034bd
Add setListToStudentMap validation, and testing
DJH23 Mar 13, 2024
9258388
Add lookupStudent validation, and testing
DJH23 Mar 13, 2024
a2c1ceb
Add showStudents validation, and testing
DJH23 Mar 13, 2024
e6b1d0a
Add School constructor validation, and testing
DJH23 Mar 13, 2024
4b2ae22
Add findStudentById validation, and testing
DJH23 Mar 13, 2024
7b2258e
Add findCourseById validation, and testing
DJH23 Mar 13, 2024
4c4ca22
Add findTeacherById validation, and testing
DJH23 Mar 13, 2024
b851253
Merge pull request #32 from ainafetse22/school_lookups
ainafetse22 Mar 14, 2024
2cc91ec
email validation
estefaniaemburse Mar 14, 2024
d515919
show profit
estefaniaemburse Mar 14, 2024
c494418
change id generation
estefaniaemburse Mar 14, 2024
0a61b99
Merge pull request #33 from ainafetse22/bugfix_develop
ainafetse22 Mar 14, 2024
21c2684
Merge pull request #31 from ainafetse22/ReadCsvInfo
ainafetse22 Mar 14, 2024
d6bcf3b
add menu for csv
estefaniaemburse Mar 14, 2024
ef9afe4
Resolving conflicts
ivandavid858 Mar 14, 2024
8db7834
add csv
estefaniaemburse Mar 14, 2024
5ec2e60
Merge pull request #34 from ainafetse22/more_bugfix
ainafetse22 Mar 14, 2024
2271b51
Merge pull request #29 from ainafetse22/test_show_money_spent
ainafetse22 Mar 14, 2024
644e0cd
utils ID is long
estefaniaemburse Mar 14, 2024
5881dea
Merge pull request #35 from ainafetse22/more_bugfix3
ainafetse22 Mar 14, 2024
ff95add
Remove calculateProfit prints
DJH23 Mar 14, 2024
ed07759
Add return statements to if(s) to prevent null pointer exceptions
DJH23 Mar 14, 2024
ac647f0
Merge pull request #36 from ainafetse22/school_lookups
ainafetse22 Mar 14, 2024
8e23475
Add retry logic to unfound student and course IDs
DJH23 Mar 14, 2024
2f56acd
correction go back
estefaniaemburse Mar 14, 2024
50db8cd
Merge pull request #37 from ainafetse22/school_lookups
ainafetse22 Mar 14, 2024
2cc94bf
fix bug
estefaniaemburse Mar 14, 2024
770d56d
Merge pull request #38 from ainafetse22/new_fix_bug
ainafetse22 Mar 14, 2024
e2ac388
fix bug
estefaniaemburse Mar 14, 2024
6a959e1
Merge pull request #39 from ainafetse22/bugfix_assign
ainafetse22 Mar 14, 2024
1998987
fix bug
estefaniaemburse Mar 14, 2024
389183e
Merge pull request #41 from ainafetse22/assign_teacher_bugfix
ainafetse22 Mar 14, 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
9 changes: 9 additions & 0 deletions .idea/Iron-hack-school.iml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions Ironhack-school/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
target/
!.mvn/wrapper/maven-wrapper.jar
!**/src/main/**/target/
!**/src/test/**/target/

### IntelliJ IDEA ###
.idea/modules.xml
.idea/jarRepositories.xml
.idea/compiler.xml
.idea/libraries/
*.iws
*.iml
*.ipr

### Eclipse ###
.apt_generated
.classpath
.factorypath
.project
.settings
.springBeans
.sts4-cache

### NetBeans ###
/nbproject/private/
/nbbuild/
/dist/
/nbdist/
/.nb-gradle/
build/
!**/src/main/**/build/
!**/src/test/**/build/

### VS Code ###
.vscode/

### Mac OS ###
.DS_Store
7 changes: 7 additions & 0 deletions Ironhack-school/.idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

15 changes: 15 additions & 0 deletions Ironhack-school/.idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions Ironhack-school/.idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

236 changes: 236 additions & 0 deletions Ironhack-school/.idea/workspace.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

49 changes: 49 additions & 0 deletions Ironhack-school/pom.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<groupId>ironhack.com</groupId>
<artifactId>Ironhack-school</artifactId>
<version>1.0-SNAPSHOT</version>
<packaging>jar</packaging>

<name>Ironhack-school</name>
<url>http://maven.apache.org</url>

<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
</properties>

<dependencies>
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<version>3.8.1</version>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.projectlombok</groupId>
<artifactId>lombok</artifactId>
<version>1.18.30</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.junit.jupiter</groupId>
<artifactId>junit-jupiter</artifactId>
<version>5.8.1</version>
<scope>test</scope>
</dependency>
</dependencies>
<build>
<plugins>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
<configuration>
<source>9</source>
<target>9</target>
</configuration>
</plugin>
</plugins>
</build>
</project>
12 changes: 12 additions & 0 deletions Ironhack-school/src/files/Courses.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
name,price,money_earned
web development,3500,0
java backend,7500,0
data science,5000,0
mobile development,4000,0
cloud computing,6000,0
network security,5500,0
backend development,7000,0
frontend development,4500,0
machine learning,6500,0
artificial intelligence,8500,0
game development,4800,0
2 changes: 2 additions & 0 deletions Ironhack-school/src/files/School.csv
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
name,teacher_number,courses_number,student_number
iron_copy,1,2,2
Loading