From 29a5d72b7ff56d437b73d1862443d497e86b5a04 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Sat, 24 Feb 2024 10:26:44 +0100
Subject: [PATCH 01/22] Maven added, David Student class and Darwin Course
 class

---
 .idea/.gitignore                   |  3 ++
 .idea/homework-java-ironschool.iml | 10 ++++++
 .idea/misc.xml                     | 14 ++++++++
 .idea/modules.xml                  |  8 +++++
 .idea/vcs.xml                      |  6 ++++
 main/java/Course.java              | 57 ++++++++++++++++++++++++++++++
 main/java/Student.java             | 44 +++++++++++++++++++++++
 pom.xml                            | 26 ++++++++++++++
 8 files changed, 168 insertions(+)
 create mode 100644 .idea/.gitignore
 create mode 100644 .idea/homework-java-ironschool.iml
 create mode 100644 .idea/misc.xml
 create mode 100644 .idea/modules.xml
 create mode 100644 .idea/vcs.xml
 create mode 100644 main/java/Course.java
 create mode 100644 main/java/Student.java
 create mode 100644 pom.xml

diff --git a/.idea/.gitignore b/.idea/.gitignore
new file mode 100644
index 0000000..26d3352
--- /dev/null
+++ b/.idea/.gitignore
@@ -0,0 +1,3 @@
+# Default ignored files
+/shelf/
+/workspace.xml
diff --git a/.idea/homework-java-ironschool.iml b/.idea/homework-java-ironschool.iml
new file mode 100644
index 0000000..76c2124
--- /dev/null
+++ b/.idea/homework-java-ironschool.iml
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="AdditionalModuleElements">
+    <content url="file://$MODULE_DIR$" dumb="true">
+      <sourceFolder url="file://$MODULE_DIR$/JAVA" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
+    </content>
+  </component>
+</module>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
new file mode 100644
index 0000000..fdc35ea
--- /dev/null
+++ b/.idea/misc.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ExternalStorageConfigurationManager" enabled="true" />
+  <component name="MavenProjectsManager">
+    <option name="originalFiles">
+      <list>
+        <option value="$PROJECT_DIR$/pom.xml" />
+      </list>
+    </option>
+  </component>
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/modules.xml b/.idea/modules.xml
new file mode 100644
index 0000000..7d98804
--- /dev/null
+++ b/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/homework-java-ironschool.iml" filepath="$PROJECT_DIR$/.idea/homework-java-ironschool.iml" />
+    </modules>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
new file mode 100644
index 0000000..35eb1dd
--- /dev/null
+++ b/.idea/vcs.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/main/java/Course.java b/main/java/Course.java
new file mode 100644
index 0000000..329885a
--- /dev/null
+++ b/main/java/Course.java
@@ -0,0 +1,57 @@
+
+import java.util.UUID;
+public class Course {
+    private String courseId;
+    private String name;
+    private double price;
+    private double money_earned;
+    //private Teacher teacher; Add it once Teacher class is created
+
+
+    public Course(String courseId, String name, double price, double money_earned) {
+        setCourseId(courseId);
+        setName(name);
+        setPrice(price);
+        setMoney_earned(money_earned);
+    }
+
+    public String getCourseId() {
+        return UUID.randomUUID().toString();
+    }
+
+    public void setCourseId(String courseId) {
+        this.courseId = courseId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getPrice() {
+        return price;
+    }
+
+    public void setPrice(double price) {
+        this.price = price;
+    }
+
+    public double getMoney_earned() {
+        return money_earned;
+    }
+
+    public void setMoney_earned(double money_earned) {
+        this.money_earned = money_earned;
+    }
+
+    /*public Teacher getTeacher() {
+        return teacher;
+    }
+
+    public void setTeacher(Teacher teacher) {
+        this.teacher = teacher;
+    }*/
+}
diff --git a/main/java/Student.java b/main/java/Student.java
new file mode 100644
index 0000000..4153e47
--- /dev/null
+++ b/main/java/Student.java
@@ -0,0 +1,44 @@
+import java.util.UUID;
+public class Student {
+    private String studentId;
+    private String name;
+    private String address;
+    private String email;
+    private Course course;
+    public Student(String name, String address, String email) {
+        this.name = name;
+        this.address = address;
+        this.email = email;
+        this.studentId = generateStudentId();
+    }
+    public String getStudentId() {
+        return studentId;
+    }
+    public String generateStudentId() {
+        return UUID.randomUUID().toString();
+    }
+    public String getName() {
+        return name;
+    }
+    public void setName(String name) {
+        this.name = name;
+    }
+    public String getAddress() {
+        return address;
+    }
+    public void setAddress(String address) {
+        this.address = address;
+    }
+    public String getEmail() {
+        return email;
+    }
+    public void setEmail(String email) {
+        this.email = email;
+    }
+    public Course getCourse() {
+        return course;
+    }
+    public void setCourse(Course course) {
+        this.course = course;
+    }
+}
\ No newline at end of file
diff --git a/pom.xml b/pom.xml
new file mode 100644
index 0000000..97581e5
--- /dev/null
+++ b/pom.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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>groupId</groupId>
+    <artifactId>homework-java-ironschool</artifactId>
+    <version>1.0-SNAPSHOT</version>
+
+    <properties>
+        <maven.compiler.source>21</maven.compiler.source>
+        <maven.compiler.target>21</maven.compiler.target>
+        <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
+    </properties>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter</artifactId>
+            <version>5.9.1</version>
+            <scope>test</scope>
+        </dependency>
+    </dependencies>
+    
+</project>
\ No newline at end of file

From 94505a4746a9d93cc69f4a76e8090cf88405d249 Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 10:31:14 +0100
Subject: [PATCH 02/22] Teacher commit

---
 main/java/Teacher.java | 39 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 main/java/Teacher.java

diff --git a/main/java/Teacher.java b/main/java/Teacher.java
new file mode 100644
index 0000000..2c8d1df
--- /dev/null
+++ b/main/java/Teacher.java
@@ -0,0 +1,39 @@
+import java.util.UUID;
+
+
+public class Teacher {
+    private final String teacherId;
+    private String name;
+    private double salary;
+
+    public Teacher(String name, double salary) {
+        this.teacherId = UUID.randomUUID().toString();
+        setName(name);
+        setSalary(salary);
+    }
+
+    public String getTeacherId() {
+        return teacherId;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public double getSalary() {
+        return salary;
+    }
+
+    public void setSalary(double salary) {
+        if (salary < 0) {
+            throw new IllegalArgumentException("Salary cannot be negative");
+        } else {
+            this.salary = salary;
+        }
+    }
+
+}
\ No newline at end of file

From c83641bb41135323b0a2720f3983b09b871fecf6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Sat, 24 Feb 2024 10:31:36 +0100
Subject: [PATCH 03/22] Maven set

---
 .idea/homework-java-ironschool.iml   | 4 ++--
 {main => src/main}/java/Course.java  | 0
 {main => src/main}/java/Student.java | 0
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename {main => src/main}/java/Course.java (100%)
 rename {main => src/main}/java/Student.java (100%)

diff --git a/.idea/homework-java-ironschool.iml b/.idea/homework-java-ironschool.iml
index 76c2124..c03b9b2 100644
--- a/.idea/homework-java-ironschool.iml
+++ b/.idea/homework-java-ironschool.iml
@@ -3,8 +3,8 @@
   <component name="AdditionalModuleElements">
     <content url="file://$MODULE_DIR$" dumb="true">
       <sourceFolder url="file://$MODULE_DIR$/JAVA" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/main/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/test/java" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
     </content>
   </component>
 </module>
\ No newline at end of file
diff --git a/main/java/Course.java b/src/main/java/Course.java
similarity index 100%
rename from main/java/Course.java
rename to src/main/java/Course.java
diff --git a/main/java/Student.java b/src/main/java/Student.java
similarity index 100%
rename from main/java/Student.java
rename to src/main/java/Student.java

From 22900cad58c892d0704cd0fbcd536bc4a4e0a2ad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Sat, 24 Feb 2024 10:35:29 +0100
Subject: [PATCH 04/22] Maven set

---
 src/main/java/Course.java | 2 ++
 src/test/java/test.java   | 4 ++++
 2 files changed, 6 insertions(+)
 create mode 100644 src/test/java/test.java

diff --git a/src/main/java/Course.java b/src/main/java/Course.java
index 329885a..9fce2c2 100644
--- a/src/main/java/Course.java
+++ b/src/main/java/Course.java
@@ -3,6 +3,8 @@
 public class Course {
     private String courseId;
     private String name;
+
+
     private double price;
     private double money_earned;
     //private Teacher teacher; Add it once Teacher class is created
diff --git a/src/test/java/test.java b/src/test/java/test.java
new file mode 100644
index 0000000..e3bba97
--- /dev/null
+++ b/src/test/java/test.java
@@ -0,0 +1,4 @@
+
+public class test {
+
+}

From a0d3cb2b7912e0d049673dba84ad42e4f9cbe1dd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Sat, 24 Feb 2024 10:36:38 +0100
Subject: [PATCH 05/22] Teacher class added to Course.java

---
 src/main/java/Course.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/Course.java b/src/main/java/Course.java
index 9fce2c2..3503218 100644
--- a/src/main/java/Course.java
+++ b/src/main/java/Course.java
@@ -7,7 +7,7 @@ public class Course {
 
     private double price;
     private double money_earned;
-    //private Teacher teacher; Add it once Teacher class is created
+    private Teacher teacher;
 
 
     public Course(String courseId, String name, double price, double money_earned) {
@@ -49,11 +49,11 @@ public void setMoney_earned(double money_earned) {
         this.money_earned = money_earned;
     }
 
-    /*public Teacher getTeacher() {
+    public Teacher getTeacher() {
         return teacher;
     }
 
     public void setTeacher(Teacher teacher) {
         this.teacher = teacher;
-    }*/
+    }
 }

From 308ebaf1a02ed23cb5ec5f913b875c7e271c860c Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 11:16:31 +0100
Subject: [PATCH 06/22] Teacher commit 2

---
 src/main/java/Teacher.java | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Teacher.java b/src/main/java/Teacher.java
index 2c8d1df..b45ec11 100644
--- a/src/main/java/Teacher.java
+++ b/src/main/java/Teacher.java
@@ -28,12 +28,13 @@ public double getSalary() {
         return salary;
     }
 
-    public void setSalary(double salary) {
+    public boolean setSalary(double salary) {
         if (salary < 0) {
-            throw new IllegalArgumentException("Salary cannot be negative");
+            return false;
         } else {
             this.salary = salary;
         }
+        return true;
     }
 
 }
\ No newline at end of file

From ed8dc6d3d83a3450e205ba0c4c7ff9d60e26f8f1 Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 11:21:16 +0100
Subject: [PATCH 07/22] fix teacher class

---
 target/classes/Teacher.class | Bin 0 -> 1123 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
 create mode 100644 target/classes/Teacher.class

diff --git a/target/classes/Teacher.class b/target/classes/Teacher.class
new file mode 100644
index 0000000000000000000000000000000000000000..5f61a0c63e1ab4480ea52203bdea91d7da8d9b93
GIT binary patch
literal 1123
zcmZuwT~8B16g|_HZo5tkEU<#26cA_^rG9?|LqbFol8O(7CO(<zGAWDOU9wDx{u3Yk
z4{9P{G|_i|l=05)@}cyl_s;a3d+#}S_V=IfKLM=biHQud267w&$TJM>iUU#iMbN3g
zYVS%{G31|mfu~j&vejD4L;*zuCdVakhH?z=DbKHOZLO~{n2`v!!)|i0s<p<yfMv}u
za|~jLp`gO1ioBr1FnWTFJ14ixMOYXyFv>9oo59$W!rhS(Ls2E!`Zj}=bU4p5i8szM
zfh$DXmuf?FCBs<tB2w$IFv)QZ*QqRFo5B~-dxl(ft=7^5R5+$}_gp|#^u;X44a|`(
z`ze&I8CYPLIdg8^_hm=;t5K)dm4SNx&Xs%03xfh`3=>I<iYtO3RF$@@1O!&zfiy9X
zMZE`_+wL<hO+<4%3%5zlV8aXKMz7nJ(WYqobYnF_SNJUvdHS4Q=G2b2Ps$ppcgqaC
zBUO6R{uy*k3@TD~BA-@G%PcjOaNoWZducVZ8TKMqzVLKEo)%fsy2&Gp9uknHNZX<;
zqkW4b*+nrAM$&H5?=3oY2$`ce;T(fG-(Vb}bckVR@d%fl>JhGfiK$EUYZDD965K?Y
zp4|vI#!*6@ZYxxVir_ZxP}G@j%HmA7%}{<9Luu1GMg8A^^A*FNDak-L(362cx*$&g
zX+eg2eaTb*lSliK=><|bEq8@lX?ya{;vuHawCS%8q-KC7*X`{Db*d+y>S4H#2WhQ3
zVNO)cd?M0$6_b4jq34~F-;j;kGJB!?;Uh{vF#p=B9>e+NEF5A+50;HRvEuDi$eU?$
dV3u||cWyxYbU<5w3{?AJ%w*c>NAXCH{{pJZxGMkv

literal 0
HcmV?d00001


From da605c9f927b1b397c3ec654216f84f2a47d8f94 Mon Sep 17 00:00:00 2001
From: jtiradohernandez <javiertirhe@gmail.com>
Date: Sat, 24 Feb 2024 11:39:10 +0100
Subject: [PATCH 08/22] Commands class created

---
 src/main/java/Commands.java | 73 +++++++++++++++++++++++++++++++++++++
 1 file changed, 73 insertions(+)
 create mode 100644 src/main/java/Commands.java

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
new file mode 100644
index 0000000..85b69bd
--- /dev/null
+++ b/src/main/java/Commands.java
@@ -0,0 +1,73 @@
+public class Commands {
+    private Course[] courseList;
+    private Student[] studentList;
+    private Teacher[] teacherList;
+
+    public Commands(Course[] courseList, Student[] studentList, Teacher[] teacherList) {
+        setCourseList(courseList);
+        setStudentList(studentList);
+        setTeacherList(teacherList);
+    }
+
+    public Course[] getCourseList() {
+        return courseList;
+    }
+
+    public void setCourseList(Course[] courseList) {
+        this.courseList = courseList;
+    }
+
+    public Student[] getStudentList() {
+        return studentList;
+    }
+
+    public void setStudentList(Student[] studentList) {
+        this.studentList = studentList;
+    }
+
+    public Teacher[] getTeacherList() {
+        return teacherList;
+    }
+
+    public void setTeacherList(Teacher[] teacherList) {
+        this.teacherList = teacherList;
+    }
+
+    public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
+        int length = getCourseList().length;
+
+    }
+
+    public void assign(String teacherID,String courseID){   //This command will help assign the teacher specified to the corresponding course
+
+    }
+
+    public void ShowCourses(){    //This command will display a list of all courses
+
+    }
+
+    public void LookupCourse(String courseID){ // This command will display the full details of the specified course
+
+    }
+
+    public void ShowStudents(){ //This command will display a list of all students
+
+    }
+
+    public void LookupStudent(String studentID){ //This command will display the full details of the specified student
+
+    }
+
+    public void ShowTeachers(){ //This command will display a list of all teachers
+
+    }
+
+    public void LookupTeacher(String teacherID){ // This command will display the full details of the specified teacher
+
+    }
+
+    public void ShowProfit(){ //This command will calculate (The total money earned from all courses) - (The sum of all the teachers' salaries) and return the result
+
+    }
+}
+

From 2bbf9195be2ff45ae0385e3777ccb4410a6ec0b3 Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 11:49:13 +0100
Subject: [PATCH 09/22] save commit after merge to this branch

---
 src/main/java/Application.java   |  45 +++++++++++++++++++++++++++++++
 target/classes/Application.class | Bin 0 -> 1970 bytes
 target/classes/Course.class      | Bin 0 -> 1579 bytes
 target/classes/Student.class     | Bin 0 -> 1515 bytes
 target/classes/Teacher.class     | Bin 1123 -> 1036 bytes
 5 files changed, 45 insertions(+)
 create mode 100644 src/main/java/Application.java
 create mode 100644 target/classes/Application.class
 create mode 100644 target/classes/Course.class
 create mode 100644 target/classes/Student.class

diff --git a/src/main/java/Application.java b/src/main/java/Application.java
new file mode 100644
index 0000000..25fcab8
--- /dev/null
+++ b/src/main/java/Application.java
@@ -0,0 +1,45 @@
+import java.util.Scanner;
+
+public class Application {
+
+    public static void main(String[] args) {
+
+        createSchoolName();
+        numberOfTeachers();
+
+
+    }
+    private static final Scanner scanner = new Scanner(System.in);
+
+    private static void createSchoolName() {
+        System.out.println("Welcome to the School Application");
+        System.out.println("Please enter the name of the school:");
+
+        String schoolName = scanner.nextLine();
+        System.out.println("Your school is: " + schoolName);
+
+    }
+    private static int numberOfTeachers() {
+
+        int numberofTeachers;
+        do {
+            System.out.println("How many teachers are there in the school: ");
+            while (!scanner.hasNextInt()) {
+                System.out.println("Please enter a valid number for the teachers.");
+                scanner.next();
+            }
+            numberofTeachers = scanner.nextInt();
+        } while (numberofTeachers <= 0);
+
+
+        System.out.println("In your school there are: " + numberofTeachers + " teachers");
+        return numberofTeachers;
+
+
+        }
+
+}
+
+
+
+
diff --git a/target/classes/Application.class b/target/classes/Application.class
new file mode 100644
index 0000000000000000000000000000000000000000..2b7388c4054ff4c94d9a5a2abb396ab30e961946
GIT binary patch
literal 1970
zcmaJ?TT>iG6#kmq49jrIl7(cG;1CyFh+(~7SiB^w$eQJ%iy(<co1tMR%ua93^rHL-
z-z^_}^~IN9Rg%Ige}M1)2Y-d}^vnQ*Y*|~|m(!=u_np&U_x$<K@gD&0ppiirx()PL
z=tUpH$RmEhOCI<4N~_zCgrgYx7F^#|?=y54XEri0(QhDQVL-bN+-bEu*Wt>QK5cda
z!Ih{x4Jo}9-W1w<(83UgY0+;tw?(kJyDqrX5J4CPtoGv)vIa&iTt@C3e*G|1qDfw|
zO)PS?h?y%(Yk}*lx+17%*~B=*<fiZ(*%Y>twrU7F#<x?{GPsJofom47;|9ZMhfoYg
zO9%ESk6bYZi^@PquD@5F*)Z_}Lt)JmJQTL@l?Wm<pYpWjZZr;~%;)<l?MVwa@ghYH
z9q#)gAk;W$Te)7T9vjOUOkvu<OBRZlVYn0#OM5VwzW83%TwgF;F3wyemZfvNW#MJq
zW*BeseNmA<9muAu8Z-(O_Z5|Tx>HIQgPABX+**>~*-h>r+A29Jn+H@~Iy7OsemYZI
zC-AC;*YG++roqD%B3t$8yhtqfO}xo)`&`AieZW0;$BxBd@5;D{CqQ#L-rE-5(beeD
znQOzmg|e2Ap$!y03x@Y}$|TBMvD%?1T2&ufr0=^7U9LXTI9HNS)o-;=<fDUsq?P|M
z!<D2$|8bewAR-mHL**aVr?3*Kc%5&1WXaZ~!@Uh2xO$!#dsM@viVxOO0xVOICf7v9
ziVrT9Jp$pu9&H=#uuP?mm8I{LMm@Wvi8@cOmrPwRRwWj7#hv|S-b%=s3yzmu=S*F;
z14k^nI+KwU**P7aOn0SJp$d3wS*V8G2~BK~M7L;{9n-PhaNcGn9?-q0`u1UJB^C?G
zh8#|1G~9=;GkAz^41BAPk3b4%skr`u+!v)dqgcd?+)*+(WcV>H-^4LywZ#1$PlSb<
zl>6;g`C@5OmUA1|4_l&xd%FDb3s_F;D+y8Io>zC3pmVjV`g&J99)=<`u){EQA*W7M
z4eT;Z{J$$bzHwfdq$j0|ZaPC=zbiEAr7=C()GpGjL_O2i*{5KSY0!mFsMX6rH<qZi
zVh2?5Db4zE4>hvr&GXc2Kl2%kXRtQU_7Blsz@XNob|4kU#4=WBEu%jKNt}m-s^b)n
zFp?d6f-Ab8h<f`83ioI_dyH9tOlKHllm;+N2qW~%VjQECVD1!a9D`WJT7*Skk_79A
z1ZzQK%$;Do@)L5}@WzSZt<7Ja|9u34f47|f`T1Y8m_NosL?Qnx#q5sibd%75Yt&w+
zm*WO~E+&YBO<X52hXPe->Xgqcar_LQlYgE5y%fR7)5i7FGE7HB1BQOb)YcI`c#6tz
nuyw*Lbto2jeL=P^Y+#f6AsT%}9$!Z7eQc90LvsfLd${^9924Hr

literal 0
HcmV?d00001

diff --git a/target/classes/Course.class b/target/classes/Course.class
new file mode 100644
index 0000000000000000000000000000000000000000..8d886e05d50a2f5a6756f5fefe56e0853bfd0ede
GIT binary patch
literal 1579
zcmZ{kZBNr+6o&7@y0WcoFkS={1r*uJ%LGA%;e25+A(?2x%U4sj21>Thlw#sH|B;%=
zG=A_0_@j*XY0Fqf_odI%bIx<lb?)=DfB*gd1K<_PN%Wy#LrjN?xPqZG^OISqo6bq$
z-SL@K^%TUnZO8UX3i@;Tqa+59(2&%Tf==H~^TIv16r|2AFWB$a6pZC6*Ln6m*LF^d
z!P&Hqj2zS$zh^cq$v3PcixC9_w7qxjD$~Vs<sg1c$GG@1^u295*5?nF={i;|i3v<<
zn9^|@cNC=kau=RmFB~53mK7vj)2THZ!Amxm4|v)EMLB<0$34ujuGb706^vd*`U-^P
z2{O*<xQ_>nt@;g1li8a+O5{Tw3lbS~*q#{jIt(l-P(KE}DP^%P>sS%1-stE`9FKIY
zVvP!UmRUWuTm^~BL9i_<$VVu9lcP-aNU+naQOiulcC5XN#<Ardn8$TmvXy4ltRI=K
zE$^W*=AGK-Y_JlHk+o7Moio+=CKF=_cj26PB`9`=hR)$oep*6k=Ao$99V9u)woA{o
zJwlw^r@B?^jV+X^0Axi*i&-ku#~Z8i$w6?}Co=mh)%92E>93TJYYLPckNI5Z+ZXgh
z<2q&hgkmhVpczXo3>x_shKvcdh0*W+*$s(7oX<hTkVb;nHH{&RU>K9UrcdZuXI_bV
zif3G9Cq#<B6DHxDl9{un?1W3De-kqy%_>)k*M8wv3)A1Y?Sqt#`{psfj2?u9WvB<l
zBF&T-Ek)wS;w5IU!R1>9F;x~7(D5Lu4H^$Y6>POp3d|`es__H!-5}E)AZi<gA8-`N
zd^gA}LFRgZh)z<ti0v>}fv{H~xvwPZRAfF9gny0jaEVfj*l}aw61i@WJVA^eATlNa
zc^(O})D5y63Bq4g6v$FH$SOhBdVt6+5s(sIgt<CLQ|KPeMkL5f{?a4vNTC~KlOS6?
OK;-igkk|eUcK!p}Vc?kn

literal 0
HcmV?d00001

diff --git a/target/classes/Student.class b/target/classes/Student.class
new file mode 100644
index 0000000000000000000000000000000000000000..a3b2915de70ebc828f2a11c6280b456a6da4f732
GIT binary patch
literal 1515
zcma)+TTc^V5Qg6^ZMR*vP|BGih=8=qp`H~nBm^}fY48H!erY##NxMzjt?_4RV$pcv
z5Aa7B-}!c1>bfL`<U7pH%=gSYQ-1ya@e{xi4h$qPrXy)0g|vqJmHpAKG;Oa@d3Sl`
z)O-!;SFY#!hZ@F8<%=vb$m%dmjKkERpZUGI<IyYW*)2yyp?Z_x%<s5f<3K_tOiU_&
zyI$`&-LBZCOccbHa$2_AG-#PIF^f43Qw_&+I=1hG*-z>kW=iGw)C(pSB~7*)pq$hV
z6tS%1j)@hlYM4+&J>P9s&d*O?YcM*tS8un1OJR_A=s-z|STk`?P%?fyC_{)hOl;yl
z6{)p*oi3}*RFBo^K*N6NU%daZlrN~=al6iJlU3JqPJ69Or}N&vY$`R|HM@CXcU-xL
z#-#tj?Xuo#s16@D8;(DsmCoy_YKPt(oMvPA<ZXk#M?q6~q5JTX;g>hk8rDgBc+Aoo
z6is((HxwXCpTURm(!j2sIHO24=dCLxnIY$%bOmcvHNinlab*{IO2}ZTodctG4vE?+
zJ@;{NVz9-v#M>wOC%G?M-=JCBedyLsA31BckGy4FW4e#|FDkmsbqQ&%8AfFJXJCTa
zrkTBn94vmZf?U|f4sXn=STuDK8X;Ylp~V>A-^E-=QQ<CLDeEidKl6})JeO9+NtN0R
z9KzI^%sDMm!b9#7tbfPSHSR{k3nStBFnn(qKKiyE4W1ndP7Q-Aco4pQNKz>(t)#mV
zO8zMT3lw@$Wta=RhQg#nVKmYY>KFydML~+OAdlifa#4^Kf~?*GB7G47AIE~^qabUs
zAWz~!@==ftf^6ObB4Z&SPw|Yabaqsc^(e?zEXZ@b2!sD>&3Y8XBFOeFAo4pAkbNQ~
G@bV9j*x1Ve

literal 0
HcmV?d00001

diff --git a/target/classes/Teacher.class b/target/classes/Teacher.class
index 5f61a0c63e1ab4480ea52203bdea91d7da8d9b93..6f5d736f4ee04b161be3e56cb80a2f31e2aca031 100644
GIT binary patch
delta 481
zcmZutJ5Iwu6r6`+V@wh!fE-K!<wIh#0UV&B<P>~PK*Jew0XjDnNVz~Hh?E#a!2vh|
zE%!jouB|9Vn%&v==FOX(U-!xNzW+YI09@m8>NQ2~)4s&%Sbj!*2qJbKV4=i&PrXCb
z2i7xG=BTSdhK7nWG;gNtt|8_bz~;F@zK1F{v5hi9RB+5{i#k++!hp9%ZSuvSBlM^s
zI6<x0np_d+rmbeEzY*jc98;_r#d1z46a}aGbUL(xNW00oJ1e;%_w#@0qtzH`u19@f
zm;OV;56s(HxOED*f-@v~lI+BI&MkIcSy;BXzjEyX4vXPihNJ`Wqr2+!3v6qmqB%OH
m32T-KbIZiu;y2oG(PfOiC2Rh|nhzbHU}z@AB|JA~F8%>q$0sQO

delta 569
zcmZvYy-or_6ot=#{I~)E)I~tdf(p2(>%Ul1SlE~t6B8?4$%bIo#gLU~#S7TcSojV~
zB49Mp-bb)9@jZ-pW(iu*%+H;3&;91y`oI0s$Ir_ffD(4vQj)QwR+i-te8@3m&h>__
znYvZc_Ds{L=w_*2xw<ecd-u9*T-w!|<;Ma;{7^Ub`i)Z7EvsfLXNF>t*seAV30V{Z
z@F3CJXP?bQFf7rm3fvf>J+Ah^)Mxm*2zC%r3thz2d>6?!J-V<=t4z(nD9I&+Fotmi
zFohsAsw!kdCRo8L?fjG`Jrk!n%##Dd8p8dd8j4IjdekRG9!cd)@QPwsI0hU+-;rV6
z>27_w<Q%7Qv=c+MaU}SpR>~b~a;-%EAXX1?aavj2y#rcrpO#?*o4k`WnqUSvV&;Jg
z{}HE$j!j{v-+V$L@j&F<Y3S}A!B=FDqxl}xcQw~RhG*&)nMOtU3jHQc|C_}mW%WlW
T4+v%O6dATeC*whG3#Q^PJB&h-


From 4f88d199cde1de2189c2404611dac3b95966521f Mon Sep 17 00:00:00 2001
From: Celularfreak <82029406+celularfreak@users.noreply.github.com>
Date: Sat, 24 Feb 2024 12:41:38 +0100
Subject: [PATCH 10/22] minor changes student

---
 src/main/java/Student.java | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/src/main/java/Student.java b/src/main/java/Student.java
index 4153e47..afd31bc 100644
--- a/src/main/java/Student.java
+++ b/src/main/java/Student.java
@@ -1,43 +1,51 @@
 import java.util.UUID;
+
 public class Student {
-    private String studentId;
+    private final String studentId;
     private String name;
     private String address;
     private String email;
     private Course course;
+
     public Student(String name, String address, String email) {
         this.name = name;
         this.address = address;
         this.email = email;
-        this.studentId = generateStudentId();
+        this.studentId = UUID.randomUUID().toString();
     }
+
     public String getStudentId() {
         return studentId;
     }
-    public String generateStudentId() {
-        return UUID.randomUUID().toString();
-    }
+
     public String getName() {
         return name;
     }
+
     public void setName(String name) {
         this.name = name;
     }
+
     public String getAddress() {
         return address;
     }
+
     public void setAddress(String address) {
         this.address = address;
     }
+
     public String getEmail() {
         return email;
     }
+
     public void setEmail(String email) {
         this.email = email;
     }
+
     public Course getCourse() {
         return course;
     }
+
     public void setCourse(Course course) {
         this.course = course;
     }

From f04c24f91c54e6a2b6f607f9610e7019f5b408ac Mon Sep 17 00:00:00 2001
From: jtiradohernandez <javiertirhe@gmail.com>
Date: Sat, 24 Feb 2024 13:30:24 +0100
Subject: [PATCH 11/22] Change from arrays to maps in Command class

---
 src/main/java/Commands.java | 65 ++++++++++++++++++++++++++++++-------
 1 file changed, 53 insertions(+), 12 deletions(-)

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index 85b69bd..fbca649 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -1,41 +1,82 @@
+import java.util.HashMap;
+import java.util.Map;
+
 public class Commands {
-    private Course[] courseList;
-    private Student[] studentList;
-    private Teacher[] teacherList;
+    private Map<String, Course> courseList = new HashMap<>();
+    private Map<String, Student> studentList = new HashMap<>();
+    private Map<String, Teacher> teacherList = new HashMap<>();
+
 
-    public Commands(Course[] courseList, Student[] studentList, Teacher[] teacherList) {
+    public Commands(Map<String, Course> courseList, Map<String, Student> studentList, Map<String, Teacher> teacherList) {
         setCourseList(courseList);
         setStudentList(studentList);
         setTeacherList(teacherList);
     }
 
-    public Course[] getCourseList() {
+    public Map<String, Course> getCourseList() {
         return courseList;
     }
 
-    public void setCourseList(Course[] courseList) {
+    public void setCourseList(Map<String, Course> courseList) {
         this.courseList = courseList;
     }
 
-    public Student[] getStudentList() {
+    public Map<String, Student> getStudentList() {
         return studentList;
     }
 
-    public void setStudentList(Student[] studentList) {
+    public void setStudentList(Map<String, Student> studentList) {
         this.studentList = studentList;
     }
 
-    public Teacher[] getTeacherList() {
+    public Map<String, Teacher> getTeacherList() {
         return teacherList;
     }
 
-    public void setTeacherList(Teacher[] teacherList) {
+    public void setTeacherList(Map<String, Teacher> teacherList) {
         this.teacherList = teacherList;
     }
 
-    public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
-        int length = getCourseList().length;
+    public void commandSelector(CommandEnum commandAction){
+        String studentID = "asdfasdf";
+        String courseID = "asdfasdf";
+        String teacherID = "asdfasdf";
+        switch (commandAction){
+        case ENROLL:
+
+            enroll(studentID,courseID);
+            break;
+        case ASSIGN:
+            assign(teacherID,courseID);
+            break;
+        case SHOW_COURSES:
+            ShowCourses();
+            break;
+        case LOOKUP_COURSE:
+            LookupCourse(courseID);
+            break;
+        case SHOW_STUDENTS:
+            ShowStudents();
+            break;
+        case LOOKUP_STUDENT:
+            LookupStudent(studentID);
+            break;
+        case SHOW_TEACHERS:
+            ShowTeachers();
+            break;
+        case LOOKUP_TEACHER:
+            LookupTeacher(teacherID);
+            break;
+        case SHOW_PROFIT:
+            ShowProfit();
+            break;
+        default:
+            System.err.println("The command selected is not available");
+            break;
+        }
+    }
 
+    public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
     }
 
     public void assign(String teacherID,String courseID){   //This command will help assign the teacher specified to the corresponding course

From 3a00d3dcaad8d69aa16ec43f03a468e968b8260c Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 15:14:24 +0100
Subject: [PATCH 12/22] save commit after merge to this branch

---
 .gitignore                           |   4 +++
 .idea/codeStyles/Project.xml         |   7 +++++
 .idea/codeStyles/codeStyleConfig.xml |   5 ++++
 .idea/compiler.xml                   |  13 +++++++++
 .idea/encodings.xml                  |   7 +++++
 .idea/jarRepositories.xml            |  20 ++++++++++++++
 .idea/misc.xml                       |   1 +
 .idea/modules.xml                    |   8 ------
 src/main/java/Application.java       |  39 ++++++++++++++++++++++++---
 src/main/java/Commands.java          |   4 +--
 target/classes/Application.class     | Bin 1970 -> 3702 bytes
 target/classes/Commands.class        | Bin 0 -> 2737 bytes
 target/classes/Student.class         | Bin 1515 -> 1424 bytes
 13 files changed, 95 insertions(+), 13 deletions(-)
 create mode 100644 .gitignore
 create mode 100644 .idea/codeStyles/Project.xml
 create mode 100644 .idea/codeStyles/codeStyleConfig.xml
 create mode 100644 .idea/compiler.xml
 create mode 100644 .idea/encodings.xml
 create mode 100644 .idea/jarRepositories.xml
 delete mode 100644 .idea/modules.xml
 create mode 100644 target/classes/Commands.class

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..278b59f
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+# Default ignored files
+/shelf/
+/.idea/workspace.xml
+
diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
new file mode 100644
index 0000000..919ce1f
--- /dev/null
+++ b/.idea/codeStyles/Project.xml
@@ -0,0 +1,7 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <ScalaCodeStyleSettings>
+      <option name="MULTILINE_STRING_CLOSING_QUOTES_ON_NEW_LINE" value="true" />
+    </ScalaCodeStyleSettings>
+  </code_scheme>
+</component>
\ No newline at end of file
diff --git a/.idea/codeStyles/codeStyleConfig.xml b/.idea/codeStyles/codeStyleConfig.xml
new file mode 100644
index 0000000..a55e7a1
--- /dev/null
+++ b/.idea/codeStyles/codeStyleConfig.xml
@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="PREFERRED_PROJECT_CODE_STYLE" value="Default" />
+  </state>
+</component>
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
new file mode 100644
index 0000000..f0d9157
--- /dev/null
+++ b/.idea/compiler.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="CompilerConfiguration">
+    <annotationProcessing>
+      <profile name="Maven default annotation processors profile" enabled="true">
+        <sourceOutputDir name="target/generated-sources/annotations" />
+        <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
+        <outputRelativeToContentRoot value="true" />
+        <module name="homework-java-ironschool" />
+      </profile>
+    </annotationProcessing>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
new file mode 100644
index 0000000..aa00ffa
--- /dev/null
+++ b/.idea/encodings.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding">
+    <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
+    <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..712ab9d
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Central Repository" />
+      <option name="url" value="https://repo.maven.apache.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index fdc35ea..de4b033 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -7,6 +7,7 @@
         <option value="$PROJECT_DIR$/pom.xml" />
       </list>
     </option>
+    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_21" default="true" project-jdk-name="21" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/out" />
diff --git a/.idea/modules.xml b/.idea/modules.xml
deleted file mode 100644
index 7d98804..0000000
--- a/.idea/modules.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/homework-java-ironschool.iml" filepath="$PROJECT_DIR$/.idea/homework-java-ironschool.iml" />
-    </modules>
-  </component>
-</project>
\ No newline at end of file
diff --git a/src/main/java/Application.java b/src/main/java/Application.java
index 25fcab8..890b11e 100644
--- a/src/main/java/Application.java
+++ b/src/main/java/Application.java
@@ -1,3 +1,5 @@
+import java.util.HashMap;
+import java.util.Map;
 import java.util.Scanner;
 
 public class Application {
@@ -5,7 +7,7 @@ public class Application {
     public static void main(String[] args) {
 
         createSchoolName();
-        numberOfTeachers();
+        teacherDetails();
 
 
     }
@@ -29,15 +31,46 @@ private static int numberOfTeachers() {
                 scanner.next();
             }
             numberofTeachers = scanner.nextInt();
+
+            if (numberofTeachers <= 0) {
+                System.err.println("The number of teachers can't be 0 or negative");
+            } else if (numberofTeachers == 1) {
+                System.out.println("In your school there is only " + numberofTeachers + " teacher");
+            } else {
+                System.out.println("In your school there are " + numberofTeachers + " teachers");
+            }
+
         } while (numberofTeachers <= 0);
 
 
-        System.out.println("In your school there are: " + numberofTeachers + " teachers");
         return numberofTeachers;
 
-
         }
 
+        private static Map<String,Teacher> teacherDetails() {
+            Map<String,Teacher> teachersMap = new HashMap<>();
+            int numberOfTeachers = numberOfTeachers();
+            scanner.nextLine();
+            for (int i = 0; i < numberOfTeachers; i++) {
+                System.out.println("Enter details for Teacher " + (i + 1) + ":");
+
+                System.out.println("Name: ");
+                String name = scanner.nextLine();
+
+                System.out.println("Salary: ");
+                double salary = Double.parseDouble(scanner.nextLine());
+                Teacher teacher = new Teacher(name, salary);
+                teachersMap.put(teacher.getTeacherId(), teacher );
+            }
+
+            for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
+                System.out.println("Teacher ID: " + entry.getKey() + ", Name: " + entry.getValue().getName() + ", Salary: " + entry.getValue().getSalary());
+            }
+
+            return teachersMap;
+
+    }
+
 }
 
 
diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index fbca649..d84e6f4 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -37,7 +37,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
         this.teacherList = teacherList;
     }
 
-    public void commandSelector(CommandEnum commandAction){
+ /*   public void commandSelector(CommandEnum commandAction){
         String studentID = "asdfasdf";
         String courseID = "asdfasdf";
         String teacherID = "asdfasdf";
@@ -74,7 +74,7 @@ public void commandSelector(CommandEnum commandAction){
             System.err.println("The command selected is not available");
             break;
         }
-    }
+    } */
 
     public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
     }
diff --git a/target/classes/Application.class b/target/classes/Application.class
index 2b7388c4054ff4c94d9a5a2abb396ab30e961946..c7622be144595d414c3a74c9812529b3d740651d 100644
GIT binary patch
literal 3702
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
J|H6N;|9|r$wvqq<

delta 622
zcmYk3-A)rx6otQO)0uWU^aq253S>}fq#C`^8$$61M5`iIQLO)^4wgjQq%DbF@dPI7
zBwqRi-n1q{F!2Gr^TK!V3A|L+6jR7#);{O#wf0{7oIj)8r2XUX&UfG<wfFXVCRN{f
zwdysO)|S0WwdOTj2H_J^#m>j6&`{FAs(Y{7#d>=XgMz~;X8p17upJ}K1xGb5`2*&J
zIqwkRvVYe6?axPNOJ##}xv|l7Th&^l@zPyyO}j>vhX#|yy8Grprmc>iTWNYCxb6QA
zk|vLBp77M-S<tfLFT{SD7S9cGe#sv9-^Hx3#hSlp7d9g@7QqxQXs9!ahGHbYh0)O>
z#1&zXhA>x!&K`jx*R+dqof|p{#M6oaFS?DjjkB_^Pe==vFe;26sFRMe$W0|}9rs-L
z+4#A+py^@xf}|uVeS>5;#4(2Y;tT^UQR-<E;_aDuE6ah28UI84<mRV;zq+KdJIugW
zhO?iQ3HL@is=9DQII6c8V}x;4cgZusX(lyHuHPxI?zgxt{vG`hRj{%WF88nPcyB&P
vd?Q!xa(;`sFSs2F$jkl(I-=cGg%I~xQA}v{NR0bEe88&CZ0)OfykKM(J(pQh

diff --git a/target/classes/Commands.class b/target/classes/Commands.class
new file mode 100644
index 0000000000000000000000000000000000000000..80cb782c9d8c3125baa79915bf9b60c054d5f12c
GIT binary patch
literal 2737
zcmb7F?{C{w6g@9#k~VePw55d&HrkbLjng&*R(_>)jE(_PfJ&(<kobU`n#LoItJneY
z5AgSZ1f2vDeCLlsoa^VrvFDKR!S;LioqNx@_q})h_dmb?3E&YvE+T_$0W$`2$Sahe
zTHjl>j@7-WeR1~GZutuN1E=fwhYH#4%4q?!3QGZ~?>n8^CzjX#%(^O~fb1ORVH8j@
zuz*E{*(3Mz((0aj3dNS&?|F8^@fdHh5xLW~E^bQ(mc?h@^ZVy^*B7MNUofy5*nQh-
zwe6nRi?qLJ;3eEpD0#MjG!lDxI}yBcD)5&Lydv-g!kZC;EZsKn>R{<4B2k!YIu~8b
z@AqtlYCP(Jo(5HF`aP$6QEzA!^~1Wt&SZ2bVp@18EP&rnrWj|dC#IECg_$GwoLMY3
zoUZ+O|MJZ4omgibT9zAb%j%q3JxAuDamH^uvS&<5?;lfIivxeW8i0RFsQJ&*#HFP{
zqq<DSMn#bvOBeBzu(Vx?hhP@FNn4tPk&WE@Kgo%R1&SCsUkZEEFh)r$)TW?}@B_}+
z!JUdTD&BOQ5ned+cDLttItuqfxv{GdwUF>~h|8R(@7<@5<=8z3VY|>hLe}$^=kfB<
z$=5ehjPuR5`-9#bo=&6Ty5IG$^ju*zMTf8&;uO}4UM1}n8p7o;wP-ms@Cu0canJqM
zVcRM;*=Jhz6GtviX>d38Bol0~k!09UvwXAnL1CS<4DA`|Ys2{+&e_j~^G%dF&fzuM
zx9IT~Bh2u-Z$5)E|3KlZXPEm9#b{WLhAU?E8f)gxHEx=_*SPfy9kaO0_Z`ggU1X>n
z$?~|#?z}~bCJfY2!UKxDM}(=#u#F05qz%Q(NMuV&`+?vrv0zf!5Vb+s8YL-d)FxNg
zInJQU)gA1HN!2(Lbk6)0#h(L!h|CAZr9g<G0ilrf0JBFMdwdw=m|r2vn^o2$N>zSe
zpu`;3f=Fu`HB2cVrX=z;i&#YdIxQKNL*ag^)N)eljj>W+XAu5h7)~}ZCbgWDdW%wT
zkCCd6%Ba+3?&U!08yvlvDs?3(bz`j52MoghU7FODq|_}+y*oy#KE<O_SFt&iy3f&D
zc$;r2$U{DIaFh^af)lDY|2PP)Pn8;OnZi4Gm#%ccdmLr>txpbiGA7u;bHUyZ&Ymc%
z1|%uUz8opwK$*fJQ_(5y2brWeemzpJf#V<%xdtCh=Kdy?`_W|X^D*4IoC+UK=5D8Q
ZA5G@&jN#VRS9m;``zn?DqoC4H{sn+h><0h<

literal 0
HcmV?d00001

diff --git a/target/classes/Student.class b/target/classes/Student.class
index a3b2915de70ebc828f2a11c6280b456a6da4f732..6e08ad55a30920967de2b288dea7de2bca5de24a 100644
GIT binary patch
literal 1424
zcma)*+iuf95QhIvlQ?mmHlzojw4nzmiF*jN992}QDj-FQ%0+4K-PkIwa*z^-3!Vxj
z0*DJ9fQLf-vv$&AT#1|Ao$>6<H~)@*{r>S2zyY3{NMXW2+Cm0dh2n+t!Kt;J&Ux+a
z*@f2(6tXY<jvwqROjN3;dE}5cU|N`jrC=Nf1J~;?D&29~o<gZ{ncz6+`JMAUxiV#8
zTE{!C+w=N;@!hac5?{t^JATW=EanW%Teyi^3R61GAn;qYlau-@1+(XL+-^HGN|kC@
zXB@C6_ZKYO!J<Mg=!UfwW=D~_r7J{b3wNb@z8`i_cZF%i!YbC-bF(|>_1RCZai~vw
z3NI@E_Vz!X>M7MZ?7GZ0-S9i!(V%_i_1-yWEv;9#>9kIro-cOfOb74%KG7PHx-4#;
zdqHH?UFuHrNDFTCN2j?2KB;Xo_8^p<2E)fjj$dAj`0SJZ=$NNBY?|SeZ!AEbF{2NY
zm62bUIHpKV?~N}lSrO;9JRw%7YKo(l;bT*9o>DS8dgn;!onxSPO3&Q{X9D-Q-lz4E
z@oDa5`x}(KF@#}n4pFeThA7(KG4mC-hgkZo@2_)RK$fe?JCn#W?-UA{;kv{De84Yu
zm<<(FX)&*+QTil2!djNW!~_X!EJhqP?h=);zhLPT4=G5wtag@kYAXzgQY&mEUN+*F
z=Myh)VvFfSfqj+|s;ut*vQznUrQZyPUOJl(qsE<Oqs|nz6F~}bka8kOEg7T`2U#V^
z+BF~|tjPB;5u_LgSx*FclnhdggV+SwxCTVtRX}#I%T?69`mW1yknKc}$9NK5{_AO$
V;~+Z(*}VotMqNOj5+Q|We*hYa&E)_9

literal 1515
zcma)+TTc^V5Qg6^ZMR*vP|BGih=8=qp`H~nBm^}fY48H!erY##NxMzjt?_4RV$pcv
z5Aa7B-}!c1>bfL`<U7pH%=gSYQ-1ya@e{xi4h$qPrXy)0g|vqJmHpAKG;Oa@d3Sl`
z)O-!;SFY#!hZ@F8<%=vb$m%dmjKkERpZUGI<IyYW*)2yyp?Z_x%<s5f<3K_tOiU_&
zyI$`&-LBZCOccbHa$2_AG-#PIF^f43Qw_&+I=1hG*-z>kW=iGw)C(pSB~7*)pq$hV
z6tS%1j)@hlYM4+&J>P9s&d*O?YcM*tS8un1OJR_A=s-z|STk`?P%?fyC_{)hOl;yl
z6{)p*oi3}*RFBo^K*N6NU%daZlrN~=al6iJlU3JqPJ69Or}N&vY$`R|HM@CXcU-xL
z#-#tj?Xuo#s16@D8;(DsmCoy_YKPt(oMvPA<ZXk#M?q6~q5JTX;g>hk8rDgBc+Aoo
z6is((HxwXCpTURm(!j2sIHO24=dCLxnIY$%bOmcvHNinlab*{IO2}ZTodctG4vE?+
zJ@;{NVz9-v#M>wOC%G?M-=JCBedyLsA31BckGy4FW4e#|FDkmsbqQ&%8AfFJXJCTa
zrkTBn94vmZf?U|f4sXn=STuDK8X;Ylp~V>A-^E-=QQ<CLDeEidKl6})JeO9+NtN0R
z9KzI^%sDMm!b9#7tbfPSHSR{k3nStBFnn(qKKiyE4W1ndP7Q-Aco4pQNKz>(t)#mV
zO8zMT3lw@$Wta=RhQg#nVKmYY>KFydML~+OAdlifa#4^Kf~?*GB7G47AIE~^qabUs
zAWz~!@==ftf^6ObB4Z&SPw|Yabaqsc^(e?zEXZ@b2!sD>&3Y8XBFOeFAo4pAkbNQ~
G@bV9j*x1Ve


From 5943c248aa160c4c8da46918e9611159a5575206 Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 15:15:57 +0100
Subject: [PATCH 13/22] save commit after merge to this branch

---
 src/main/java/Application.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Application.java b/src/main/java/Application.java
index 890b11e..f2ab6da 100644
--- a/src/main/java/Application.java
+++ b/src/main/java/Application.java
@@ -63,9 +63,9 @@ private static Map<String,Teacher> teacherDetails() {
                 teachersMap.put(teacher.getTeacherId(), teacher );
             }
 
-            for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
+           /* for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
                 System.out.println("Teacher ID: " + entry.getKey() + ", Name: " + entry.getValue().getName() + ", Salary: " + entry.getValue().getSalary());
-            }
+            }*/
 
             return teachersMap;
 

From 2aed7e09e2be9556ee7edc44ba452e838727871d Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 15:20:56 +0100
Subject: [PATCH 14/22] save commit after merge to this branch

---
 src/main/java/Application.java | 3 +++
 src/main/java/Commands.java    | 4 ++--
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Application.java b/src/main/java/Application.java
index f2ab6da..6476ced 100644
--- a/src/main/java/Application.java
+++ b/src/main/java/Application.java
@@ -59,6 +59,7 @@ private static Map<String,Teacher> teacherDetails() {
 
                 System.out.println("Salary: ");
                 double salary = Double.parseDouble(scanner.nextLine());
+
                 Teacher teacher = new Teacher(name, salary);
                 teachersMap.put(teacher.getTeacherId(), teacher );
             }
@@ -71,6 +72,8 @@ private static Map<String,Teacher> teacherDetails() {
 
     }
 
+
+
 }
 
 
diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index d84e6f4..fbca649 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -37,7 +37,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
         this.teacherList = teacherList;
     }
 
- /*   public void commandSelector(CommandEnum commandAction){
+    public void commandSelector(CommandEnum commandAction){
         String studentID = "asdfasdf";
         String courseID = "asdfasdf";
         String teacherID = "asdfasdf";
@@ -74,7 +74,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
             System.err.println("The command selected is not available");
             break;
         }
-    } */
+    }
 
     public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
     }

From 06294255fdc92015ecced10c017c352f1fa5447a Mon Sep 17 00:00:00 2001
From: Celularfreak <82029406+celularfreak@users.noreply.github.com>
Date: Sat, 24 Feb 2024 16:09:04 +0100
Subject: [PATCH 15/22] commands 3-9

---
 src/main/java/Commands.java | 37 ++++++++++++++++++++++++++++++-------
 1 file changed, 30 insertions(+), 7 deletions(-)

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index fbca649..fca9b3d 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -84,31 +84,54 @@ public void assign(String teacherID,String courseID){   //This command will help
     }
 
     public void ShowCourses(){    //This command will display a list of all courses
-
+        System.out.println("List of Courses: ");
+        for (Map.Entry<String, Course> entry : courseList.entrySet()) {
+            System.out.println(entry.getKey() + " : " + entry.getValue().getName());
+        }
     }
 
     public void LookupCourse(String courseID){ // This command will display the full details of the specified course
-
+        if(courseList.containsKey(courseID)){
+            System.out.println("Course ID: " + courseID);
+            System.out.println("Course Name: " + courseList.get(courseID).getName());
+            System.out.println("Course Price: " + courseList.get(courseID).getPrice());
+            System.out.println("Course Money Earned: " + courseList.get(courseID).getMoney_earned());
+            System.out.println("Course Teacher: " + courseList.get(courseID).getTeacher().getName());
     }
 
     public void ShowStudents(){ //This command will display a list of all students
-
+        System.out.println("List of Students: ");
+        for (Map.Entry<String, Student> entry : studentList.entrySet()) {
+            System.out.println(entry.getKey() + " : " + entry.getValue().getName());
+        }
     }
 
     public void LookupStudent(String studentID){ //This command will display the full details of the specified student
-
+        if(studentList.containsKey(studentID)){
+            System.out.println("Student ID: " + studentID);
+            System.out.println("Student Name: " + studentList.get(studentID).getName());
+            System.out.println("Student Address: " + studentList.get(studentID).getAddress());
+            System.out.println("Student Email: " + studentList.get(studentID).getEmail());
+            System.out.println("Student Course: " + studentList.get(studentID).getCourse().getName());
+        }
     }
 
     public void ShowTeachers(){ //This command will display a list of all teachers
-
+        System.out.println("List of Teachers: ");
+        for (Map.Entry<String, Teacher> entry : teacherList.entrySet()) {
+            System.out.println(entry.getKey() + " : " + entry.getValue().getName());
+        }
     }
 
     public void LookupTeacher(String teacherID){ // This command will display the full details of the specified teacher
-
+        if(teacherList.containsKey(teacherID)){
+            System.out.println("Teacher ID: " + teacherID);
+            System.out.println("Teacher Name: " + teacherList.get(teacherID).getName());
+            System.out.println("Teacher Salary: " + teacherList.get(teacherID).getSalary());
+        }
     }
 
     public void ShowProfit(){ //This command will calculate (The total money earned from all courses) - (The sum of all the teachers' salaries) and return the result
-
     }
 }
 

From 2aef33aa17ab65f92e58df90cc56d72e17b0ed0e Mon Sep 17 00:00:00 2001
From: Celularfreak <82029406+celularfreak@users.noreply.github.com>
Date: Sat, 24 Feb 2024 16:22:36 +0100
Subject: [PATCH 16/22] command corrected

---
 src/main/java/Commands.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index fca9b3d..98797f5 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -43,7 +43,6 @@ public void commandSelector(CommandEnum commandAction){
         String teacherID = "asdfasdf";
         switch (commandAction){
         case ENROLL:
-
             enroll(studentID,courseID);
             break;
         case ASSIGN:
@@ -91,12 +90,13 @@ public void ShowCourses(){    //This command will display a list of all courses
     }
 
     public void LookupCourse(String courseID){ // This command will display the full details of the specified course
-        if(courseList.containsKey(courseID)){
+        if(courseList.containsKey(courseID)) {
             System.out.println("Course ID: " + courseID);
             System.out.println("Course Name: " + courseList.get(courseID).getName());
             System.out.println("Course Price: " + courseList.get(courseID).getPrice());
             System.out.println("Course Money Earned: " + courseList.get(courseID).getMoney_earned());
             System.out.println("Course Teacher: " + courseList.get(courseID).getTeacher().getName());
+        }
     }
 
     public void ShowStudents(){ //This command will display a list of all students

From 552969baf5a7e8f8a1a92659f95b07779635cbc2 Mon Sep 17 00:00:00 2001
From: Celularfreak <82029406+celularfreak@users.noreply.github.com>
Date: Sat, 24 Feb 2024 16:28:49 +0100
Subject: [PATCH 17/22] minor change in Student

---
 src/main/java/Student.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/Student.java b/src/main/java/Student.java
index afd31bc..5a64817 100644
--- a/src/main/java/Student.java
+++ b/src/main/java/Student.java
@@ -8,10 +8,10 @@ public class Student {
     private Course course;
 
     public Student(String name, String address, String email) {
+        this.studentId = UUID.randomUUID().toString();
         this.name = name;
         this.address = address;
         this.email = email;
-        this.studentId = UUID.randomUUID().toString();
     }
 
     public String getStudentId() {

From ca462add5492775eb2bc7d38717e54181a4b31e1 Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 16:42:01 +0100
Subject: [PATCH 18/22] save commit after merge to this branch

---
 src/main/java/Application.java      |  62 +++++++++++++++-------------
 src/main/java/Commands.java         |   4 +-
 src/main/java/SchoolComponents.java |  17 ++++++++
 target/classes/Application.class    | Bin 3702 -> 3894 bytes
 4 files changed, 52 insertions(+), 31 deletions(-)
 create mode 100644 src/main/java/SchoolComponents.java

diff --git a/src/main/java/Application.java b/src/main/java/Application.java
index 6476ced..e257e57 100644
--- a/src/main/java/Application.java
+++ b/src/main/java/Application.java
@@ -1,5 +1,6 @@
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Objects;
 import java.util.Scanner;
 
 public class Application {
@@ -10,6 +11,8 @@ public static void main(String[] args) {
         teacherDetails();
 
 
+
+
     }
     private static final Scanner scanner = new Scanner(System.in);
 
@@ -21,54 +24,55 @@ private static void createSchoolName() {
         System.out.println("Your school is: " + schoolName);
 
     }
-    private static int numberOfTeachers() {
 
-        int numberofTeachers;
+    private static int number(SchoolComponents classToCount) {
+        int number;
+
         do {
-            System.out.println("How many teachers are there in the school: ");
+            System.out.println(String.format("How many %s are there in the school: ", classToCount));
             while (!scanner.hasNextInt()) {
-                System.out.println("Please enter a valid number for the teachers.");
+                System.out.println(String.format("Please enter a valid number for the %s ", classToCount));
                 scanner.next();
             }
-            numberofTeachers = scanner.nextInt();
+            number = scanner.nextInt();
 
-            if (numberofTeachers <= 0) {
-                System.err.println("The number of teachers can't be 0 or negative");
-            } else if (numberofTeachers == 1) {
-                System.out.println("In your school there is only " + numberofTeachers + " teacher");
+            if (number <= 0) {
+                System.err.println(String.format("The number of %s can't be 0 or negative", classToCount));
+            } else if (number == 1) {
+                System.out.println(String.format("In your school there is only " + number + " %s", classToCount));
             } else {
-                System.out.println("In your school there are " + numberofTeachers + " teachers");
+                System.out.println(String.format("In your school there are " + number + " %s", classToCount));
             }
 
-        } while (numberofTeachers <= 0);
+        } while (number <= 0);
 
 
-        return numberofTeachers;
+        return number;
 
-        }
+    }
 
-        private static Map<String,Teacher> teacherDetails() {
-            Map<String,Teacher> teachersMap = new HashMap<>();
-            int numberOfTeachers = numberOfTeachers();
-            scanner.nextLine();
-            for (int i = 0; i < numberOfTeachers; i++) {
-                System.out.println("Enter details for Teacher " + (i + 1) + ":");
+    private static Map<String,Teacher> teacherDetails() {
+        Map<String,Teacher> teachersMap = new HashMap<>();
+        int number = number(SchoolComponents.TEACHERS);
+        scanner.nextLine();
+        for (int i = 0; i < number; i++) {
+            System.out.println("Enter details for Teacher " + (i + 1) + ":");
 
-                System.out.println("Name: ");
-                String name = scanner.nextLine();
+            System.out.println("Name: ");
+            String name = scanner.nextLine();
 
-                System.out.println("Salary: ");
-                double salary = Double.parseDouble(scanner.nextLine());
+            System.out.println("Salary: ");
+            double salary = Double.parseDouble(scanner.nextLine());
 
-                Teacher teacher = new Teacher(name, salary);
-                teachersMap.put(teacher.getTeacherId(), teacher );
-            }
+            Teacher teacher = new Teacher(name, salary);
+            teachersMap.put(teacher.getTeacherId(), teacher);
+        }
 
-           /* for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
+        for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
                 System.out.println("Teacher ID: " + entry.getKey() + ", Name: " + entry.getValue().getName() + ", Salary: " + entry.getValue().getSalary());
-            }*/
+            }
 
-            return teachersMap;
+          return teachersMap;
 
     }
 
diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index fbca649..e532def 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -37,7 +37,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
         this.teacherList = teacherList;
     }
 
-    public void commandSelector(CommandEnum commandAction){
+ /*   public void commandSelector(CommandEnum commandAction){
         String studentID = "asdfasdf";
         String courseID = "asdfasdf";
         String teacherID = "asdfasdf";
@@ -74,7 +74,7 @@ public void commandSelector(CommandEnum commandAction){
             System.err.println("The command selected is not available");
             break;
         }
-    }
+    }*/
 
     public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
     }
diff --git a/src/main/java/SchoolComponents.java b/src/main/java/SchoolComponents.java
new file mode 100644
index 0000000..eef487a
--- /dev/null
+++ b/src/main/java/SchoolComponents.java
@@ -0,0 +1,17 @@
+public enum SchoolComponents {
+
+    TEACHERS ("teachers"),
+    STUDENTS ("students"),
+    COURSES ("courses");
+
+    private String label;
+
+    SchoolComponents(String label) {
+        this.label = label;
+    }
+
+    @Override
+    public String toString() {
+        return label;
+    }
+}
diff --git a/target/classes/Application.class b/target/classes/Application.class
index c7622be144595d414c3a74c9812529b3d740651d..bca238339ace19180719437a60523c0db10b373e 100644
GIT binary patch
delta 1783
zcmZux>vt1X5dYoHHoHldQUWb))0T}i(w0Z%O;b>yEwr{pB!L=y;L?V+m<J>&P!*$6
zA1Eq%5d<yZvpx`^NSd~S;0r<V?I(|a1K;?79O~SSLgl!7&fPmRznMGpo4I?rC{<#=
zaBb)`fF=0-xP6l3@YF}Q>R}_&t$VmvDxNwMvlPtMFb8uPayA-UjLMJ^X|MDpVx5t8
z2J41sENmngs>=8|+e}_8DRw(Nn6F_0s`xr7SFUE5!naAKC7!r0Op7$!j&cS$65N&$
zip3fozm%VmCb(-g)FGF_5{$)EEGJKYM^KM+h1UmTdUOLN^_Ns+ZO||cck*IOQL;fn
zGs8GDv93gCsIuOOcQhND>}Z0;hLyNm!72?t_$hr~YezI1s)>d-MI*sTBF>=t>z35i
z*RAp~IGb)ZSKFatjfNK7LxpCNV8|^S1)Q4+R9)WSgar*M?j__3BOLVVD(<KFJ|kqr
zy1i8RIy|Vr(6An@{E($OH^`v)gGOsdFlI*^+BIaMgI}_^O53ne!$X21tv#6d2h-5z
zKo}7PQ4O20na_}YY8Y`133TzDvfHs0+Z1$bco>iHlkz;rc08saso`;I!)4j6ZpV{?
z_#J#wRzdP9hVeHzBfd)OB8gbH13h>~!?V~yWzgA;K~wddhUbM!CDj@u)D;v7zo6ko
zk)uLNQL)hN*6=c3VX%=dQ#rM=ti09<8GA(2UKNAVw2@!T@>=(4cn$mc7^~a*x+wk)
zKF4}?jMf@5;&FepCfXHAoUkg7GS}zS;6Su1rpL|x>78+}&QzRbaPwYulIn@8_>!TR
zpI2R3Lin0rQr+wvA7`7Aecp}>_)fw1;`obvne7kxX9f>nX)ocsZHh&~ue{m5JlRW^
zpc0H;Agf{k>^N;C9HiB1Dy=v~do2UNVZ2F_4R7IX(g<fSeTB1{hLVQXa>GBHMgy?Z
z>VSfrQE^nfgLh4v;xLct<%N#9NpWZ%F#=4W3CtyziS*`UG77IdPsA9!hd$Gp1~iid
zQz(i=y1o6#an6uWK?+zZd}-X4LViE=6y_a(E^OZau`O)r8~Kw^$rSEb=;}p5KWd!I
z{tN6wl}kR1Vv6A!LOpP^xiDjCyxHP9I1+Uoq0}rUr?ZGjK*xBvQG{EF`pKvg{{l=w
zM=i>*7UgthD$q@B+fC*@m}S<Um#Gi$!%qPgV+~!;52*SNNfI17Jy)T#l04!&8)FGf
zy<z)^OoafahS3xlz>3Cx+?B>^zFC`?3;-rMInK5Jl2p1vP;}pQF^vbR<YBZ0rsvB8
z*x<ER6j)Q}EU*qDWI;=h#QH{#RtzG>Fo-P-&C>?)D8qg%q|FlyXV4=eP9Mb6LYPUL
zonq6L!mi{f;iVyPGn>AVvlYiEU)khpDGdNHpGIK;Ra8Zz;YBg3F%^q2o36B%Xjn?W
z&}P&ifLgSZCXD6SMg2*m0mEoCsjDXryqJ!UXlyKmF2oUhoTNhnMAcDzLhR*ZHI5OV
z5;;%9ar6^V#YvpNr<B52LS@)KNs{P929>&w8X&#sL>}a8$X5_%><au>;ZU&s3Z<AP
zn?xk37|P5$HUqbkyLhsP;R*C(?*I;*fG+M28+HH25o(xp5<bHz`s&ovZwYbQT+f*6
c7v}nvxqgEm2<0Sv53%v1)rOz&3w}ev-$?~~wg3PC

delta 1642
zcmYjR>sM4&6#t!>%e{AIt_VYeG7?^v_!@br2n491AcDwHLJ*e0Rfm_u3=RW0Wlaxz
zSW(0=HA~VS($fNxXDL`&`K6D2=pShH2lT<^lJ>bUEI!=5_TJ~W_u2cm_dVlj|E1dR
zKA64<U=Qw&*w<QWwp0ZB^iCrX(ZfFDSeq}@ts5bq9wyDFw+DoxcOPpD2K`049qX}8
z!*=8{*xQV5ukTd2G7x64ZrXfUMIJ*I|I3om6w8z?0tz%dg3Sz4fY8EGq@fr)85H4&
zg;&~;h}{|<g^SYpLLn7<C|w=h9_Z;j>I><?mRN<{YfY6)HDscUcUe=VQU&|@fHnDG
zIjnZ5IG~|QT#&F3S<_Ot*qIYnl&bJD$X=t<SEQ?Wj6tn6{6;7u+B<|=1$7#pKs_&!
zid|1qm5af4G~lp?I6TD%q&0E_j%av>k4Q<5W*7>NYB+}D{7<P?ZAOcRR<v<XT)LwJ
zClvTKbRxj(<MJI{IH@3{p&PmULR`Aqg&x6AFQ1J|iJoFe>M(kZoStyIKd0L0%GehO
zhawL2;aLsOp_dA8^@Xc^5e3gve<s#%1X^=y!=d&-s{lqdyeNPw0qYHak53f-vW8d0
z3>0#T&V}z)4X@#K1{?Vn7)US&S>}X<vx40>`60PPep^F7-r*PJba_DZ{~o_3&m}H$
z8(iXctY10J_W!_;*cj{yEv}5--d&_K72^yWDg%0C*~#L9b?d=^KcchPY*kD$tm9R-
zHICR8shH*`Z0YPr-f!C&f76azm{l+*D!k2a+x}*E_>kQr{mziauiDf2zxEAmkS98l
zH*(r@8H{8c&XLp>_4jd}EE_K1B6$Y6*O8JVu<^7X!f%Bg3RWzOQSkvT(U~0%GvgpX
z@5qaam}JTg+Fcb+B;X;ef(z?N#_n51c|OEPW-M)`xR3NZu$Z+pjUvIBJ&x6*(8sa$
z5?sQuBj(6&7@q&fJSr@9Uq<{Wb~#Jva2V^{(v>KjgmzD3FJL-XE|~jF(>*kQ&HWAC
zWre77J9Q7FQk@S|wP{GfTB<W09+KI}Kq38^yRiY)*n~!G!4dMtdhj3*moY@~AJZoo
zP~7+7%3w(jVk90bsT=Bwog*$3LQKz~ym0~*Rg<XX+g7ZK9yBWwtyRZb%kT=bX33ny
z<Au@;8XB`!OA}};l07N%IG#?Cr_f|Y!x;-3p1<yyf{$Se?F`kKQwTB|%T7}037SQp
z$e1;Sh%io*@`6wr#_>{gnQ>+sZ!FL?Kj-<Lij_=y_R{cxT%u<O5tWA|<im{uBBKyn
zQAFBKdYg9P0FhKr+HpGXAmY!W6gN<YNtBy(RS*FM$ifvGxs}jvT*W6*x}=_X`V^lL
zcP@HfJ|{LU6r71`7$%^KQG9_fsRRwz>Gc|-?f8nU<R#SCODHi@F^6PG58zVJ%-B8D
z-G@U#*FAdIzojz^Wl{0n!mi>ZXs}|nX~k!-zHt<9P2k-z=p*D|X8#MniTD8oCl-uQ
nL4ZyJ{fQ7`ro3Uw2~$p)at1#W%1QV>G~*Z9hF|d;{y@tA%e`U&


From 1284ade5c27b13f5ca1745a7f7a0add03c075b4c Mon Sep 17 00:00:00 2001
From: Xavi Soria <xsbertran@gmail.com>
Date: Sat, 24 Feb 2024 17:02:05 +0100
Subject: [PATCH 19/22] save commit after merge to this branch

---
 src/main/java/Application.java        |  10 +++-------
 src/main/java/Commands.java           |   4 ++--
 src/main/java/SchoolComponents.java   |   5 ++++-
 target/classes/Application.class      | Bin 3894 -> 3263 bytes
 target/classes/Commands.class         | Bin 2737 -> 5659 bytes
 target/classes/SchoolComponents.class | Bin 0 -> 1351 bytes
 target/classes/Student.class          | Bin 1424 -> 1424 bytes
 7 files changed, 9 insertions(+), 10 deletions(-)
 create mode 100644 target/classes/SchoolComponents.class

diff --git a/src/main/java/Application.java b/src/main/java/Application.java
index e257e57..d74e880 100644
--- a/src/main/java/Application.java
+++ b/src/main/java/Application.java
@@ -9,11 +9,8 @@ public static void main(String[] args) {
 
         createSchoolName();
         teacherDetails();
-
-
-
-
     }
+
     private static final Scanner scanner = new Scanner(System.in);
 
     private static void createSchoolName() {
@@ -46,7 +43,6 @@ private static int number(SchoolComponents classToCount) {
 
         } while (number <= 0);
 
-
         return number;
 
     }
@@ -68,9 +64,9 @@ private static Map<String,Teacher> teacherDetails() {
             teachersMap.put(teacher.getTeacherId(), teacher);
         }
 
-        for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
+        /*for (Map.Entry<String, Teacher> entry : teachersMap.entrySet()) {
                 System.out.println("Teacher ID: " + entry.getKey() + ", Name: " + entry.getValue().getName() + ", Salary: " + entry.getValue().getSalary());
-            }
+            }*/
 
           return teachersMap;
 
diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index 972de74..98797f5 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -37,7 +37,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
         this.teacherList = teacherList;
     }
 
- /*   public void commandSelector(CommandEnum commandAction){
+    public void commandSelector(CommandEnum commandAction){
         String studentID = "asdfasdf";
         String courseID = "asdfasdf";
         String teacherID = "asdfasdf";
@@ -73,7 +73,7 @@ public void setTeacherList(Map<String, Teacher> teacherList) {
             System.err.println("The command selected is not available");
             break;
         }
-    }*/
+    }
 
     public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
     }
diff --git a/src/main/java/SchoolComponents.java b/src/main/java/SchoolComponents.java
index eef487a..6bda028 100644
--- a/src/main/java/SchoolComponents.java
+++ b/src/main/java/SchoolComponents.java
@@ -4,7 +4,7 @@ public enum SchoolComponents {
     STUDENTS ("students"),
     COURSES ("courses");
 
-    private String label;
+    private final String label;
 
     SchoolComponents(String label) {
         this.label = label;
@@ -14,4 +14,7 @@ public enum SchoolComponents {
     public String toString() {
         return label;
     }
+
+
+
 }
diff --git a/target/classes/Application.class b/target/classes/Application.class
index bca238339ace19180719437a60523c0db10b373e..9f306e71ecef0970ad2d8cee6bfa21bd4c3d83a7 100644
GIT binary patch
delta 699
zcmYL`%TH5L5XOJE@7}gzQA;se3P_1h5)lZE4>TsS(UpjGgNX|?icP4f^@UG-D|!&|
zh2jgvjYy)2CX%>x=fC03t&7I52aUP8-#K$;zL{@kKBi`?-S4H(UxCfMn|2d^H%y#D
zlp_q7u|RF$SQJ0UXJ!MHj`<aAH$9=L<d{P|mmla)7xwMX=MSY16tZb2#6wdX&Nz=v
zXSmK8HwVKt@rnS?TqbxP<VBQKyfoj!KfFOE&A7Y5_tqh0Cft<y>1LdwiANHRCnO|*
zWAUUgYVUqdaavZGGYsmbXm&)Zo652C@CsdFgrK7Tb3&Zuob^R)#-bUGw6v8u2{nY8
z3{lB^7E;9`>V^NfRm3>Y1<UPbx2@-iPIi^KYgGf5vVaszsG*58?bOl1GPcsd9y0XM
zNRj0XtKkvW*t`im;*D~VojN<%MK_m}dB~Ka$ygDbv{VJ<%bWVx;lcO1`6yRxl^ST4
z+I3XWBK57R-^NPSZ6>R4JzLnob~cey=3e>x*k-G4ROeY%b6MSZ6|tBrTvgtj=5~$i
z@+RrxhLm`ezn7cbQmqR14*r#QTV{C$bIxH|L;7QQN+g5yInHnOb4O1e?kdR4O<H!w
z?nV3gLPPEY{hv5GLwZ^s$96Th<MQ@KEc>2jgY@}$s)+k__IP0Nk;NyxQh+PxYu+$L
F^&ibwZOi}w

delta 1274
zcmZvci*HkP6vscmuI;^T@7Rl#j=0gOjINF}U<});25?3e+>F@(XN=}LZnlwbGu<6B
z73*WZQP7JZN`0ckfx<Q!Y?GHy#3w!y{}e+EdhV^f65Hh5bH3;MJ@=gR`?V*lrfb4y
zFU+0*R`JI~I2y=B=x4~lW>}$H19o<#!?G1+iTXP?nVZeju-%tQ36zfTFk3W63?AW8
zMe$Wx(e~L^*0cw+is)6^*8gxRu$9L(at2S(q$u|a<h=S9ISQ@U9BQ|=*e>}ggIjr8
zG5=z{j5*Mgy6eGBR=1tjct%lixrsLOq3dsV+mA5Ha|X}5%3zOWueChrMT3`INEc|m
znHjdiY~*F5kyogf*9zKh_IuzCgI9S?5fZG!%$V5`MNy)@r5ryy4H|e|(UfqKdbQqR
zXZr?v(k)JzuOb|xjNJxru*XRTYJ+bX1lT)ucc5I=1iZy6DzDh-rH0dv8BA9$|G$)T
zAQ*S{2FGJ3<wUv$hqLja?%u({OuTQXIj(e0JNIjK{x22Pj;U2Tc`dBIcJ^zF8g;%^
z)OK2CcdwO=x3&noA?^<7IfbdjEeY~nn6rGZ@q;_rkItXkxrid*ZBpZ$b5KwEe^b;r
zhx8ifFTGCXokgMOlDFjs1yP=TN37xb0p8_3i9)>32ZH3C`$APImphLlv0<?hG)lRw
z(b>m`UM}KQ%scx+H?43rQQ05NN2gL03*;N)Iu>5iE})o?81u9nxW{{6X?Sd%t6eS~
zL7WO|xrS>=iL!~stYir-B)FG)9w5nx4823LJ4NC46vZcY7yIdy=StSIfsdu~xMM_O
z#d%P>r7KNx$DL)7f!qvo-)GpYXlt0^F~uHk7UxODDMs5TDP20lvu?0VoEKbY<22i@
z@VC$6z%;S3e@-V4OI<&1|EpzUSRu1FQX-v4X{MSqH*gC#%CDkXdRxt^9Btf2myFaS
zP(OFDjWryjl{waW1Fex}n_0>MSyYj*7jlqK<Rx8lB%g9fRvu#=hh<2gXd9SdQg}K?
znBp^Op+s1P6&#VsT~C2E?Xhw$?WiQiy`=vFF^ztu&eQof5sj_q<$vaw<b1Luo!P<(
zOI#;%_cL#f#a)x^I?9_<#3uw%-u#8TRVJ)C!F+tqae2mN_h*E0!n3D1laSyGFZjx{
X-|&;r%0)0L+xR&c;un79cdGsckp&n8

diff --git a/target/classes/Commands.class b/target/classes/Commands.class
index 80cb782c9d8c3125baa79915bf9b60c054d5f12c..472787def4a082941a8b0d007fd8e055d6142df8 100644
GIT binary patch
literal 5659
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
UXU`z-9)C`>;xG6c{()ux2TwOhJOBUy

literal 2737
zcmb7F?{C{w6g@9#k~VePw55d&HrkbLjng&*R(_>)jE(_PfJ&(<kobU`n#LoItJneY
z5AgSZ1f2vDeCLlsoa^VrvFDKR!S;LioqNx@_q})h_dmb?3E&YvE+T_$0W$`2$Sahe
zTHjl>j@7-WeR1~GZutuN1E=fwhYH#4%4q?!3QGZ~?>n8^CzjX#%(^O~fb1ORVH8j@
zuz*E{*(3Mz((0aj3dNS&?|F8^@fdHh5xLW~E^bQ(mc?h@^ZVy^*B7MNUofy5*nQh-
zwe6nRi?qLJ;3eEpD0#MjG!lDxI}yBcD)5&Lydv-g!kZC;EZsKn>R{<4B2k!YIu~8b
z@AqtlYCP(Jo(5HF`aP$6QEzA!^~1Wt&SZ2bVp@18EP&rnrWj|dC#IECg_$GwoLMY3
zoUZ+O|MJZ4omgibT9zAb%j%q3JxAuDamH^uvS&<5?;lfIivxeW8i0RFsQJ&*#HFP{
zqq<DSMn#bvOBeBzu(Vx?hhP@FNn4tPk&WE@Kgo%R1&SCsUkZEEFh)r$)TW?}@B_}+
z!JUdTD&BOQ5ned+cDLttItuqfxv{GdwUF>~h|8R(@7<@5<=8z3VY|>hLe}$^=kfB<
z$=5ehjPuR5`-9#bo=&6Ty5IG$^ju*zMTf8&;uO}4UM1}n8p7o;wP-ms@Cu0canJqM
zVcRM;*=Jhz6GtviX>d38Bol0~k!09UvwXAnL1CS<4DA`|Ys2{+&e_j~^G%dF&fzuM
zx9IT~Bh2u-Z$5)E|3KlZXPEm9#b{WLhAU?E8f)gxHEx=_*SPfy9kaO0_Z`ggU1X>n
z$?~|#?z}~bCJfY2!UKxDM}(=#u#F05qz%Q(NMuV&`+?vrv0zf!5Vb+s8YL-d)FxNg
zInJQU)gA1HN!2(Lbk6)0#h(L!h|CAZr9g<G0ilrf0JBFMdwdw=m|r2vn^o2$N>zSe
zpu`;3f=Fu`HB2cVrX=z;i&#YdIxQKNL*ag^)N)eljj>W+XAu5h7)~}ZCbgWDdW%wT
zkCCd6%Ba+3?&U!08yvlvDs?3(bz`j52MoghU7FODq|_}+y*oy#KE<O_SFt&iy3f&D
zc$;r2$U{DIaFh^af)lDY|2PP)Pn8;OnZi4Gm#%ccdmLr>txpbiGA7u;bHUyZ&Ymc%
z1|%uUz8opwK$*fJQ_(5y2brWeemzpJf#V<%xdtCh=Kdy?`_W|X^D*4IoC+UK=5D8Q
ZA5G@&jN#VRS9m;``zn?DqoC4H{sn+h><0h<

diff --git a/target/classes/SchoolComponents.class b/target/classes/SchoolComponents.class
new file mode 100644
index 0000000000000000000000000000000000000000..5e1d67731061a9183dac767afdb645d69c078fad
GIT binary patch
literal 1351
zcmZux?^6<C5Pl9gIL=e)6iu@-GXqS?)P6yxA&t$DHXbrLeLC<Goa3&6!_WOmg_TZC
zji39Yns#3(5jf{~-F=^ZcK6wZ-+#XU0<eK>2tElBqf~ZXJL6VAxQ^v`^)Ms^G{^`_
zQ1aQ0%vN^Skf7(ffhk5R8o~l;<o7nS+j)bX0~$1ThB7;QyGB;{hBOQ#LcZC;Ms6=l
zj3e)QDOKng2_d3k6j2Fs$)=(tjK<=*BlFly+NN`u+$kPeB`>9799Kh_&@hQ>5{51S
zS*KB@Ovk3(uy)={SdDc=XKb@xPjxs9uU2smQ=J)@K=5DJa053b1k)9#;;l&->!fN&
zzKR#P>suOTaGQ#@&7x(qViy&)kqTr5bEKMQnWeH-tE&_j;~a51`%(9D#0v_-3hoh0
z-D@21$P{P_lGJg@ZPe<PU|rJi0L!emkfAOi8jJT)oO=5Q2xQy?5_>pTajfk|wP@Ay
zX3-|kT%XF~y~E>{-I8e+%vyy5+tC5XtP)A&wdIxFgEwZ4Opkh}HS@|9I>JWf&@sJ6
zjZo2ksS2!^+tRRm8QRJcB3-iEL-NPs6f)bP9S=0!Tk%>-f@+XxCF^B{JB@ZP`6AD7
zeTl|2PG1^%eS*Ij0G+h<;-pQd8=YqlL?(I5$qv%}3YIBum8=;$`B9q~{Dv#%&_9tS
z;URqn#T}_YYy1d4fnTAMBUD{VoMG%7661ZB@Q=x(wNQA%x$%@<nZiCYlvWCULAFI_
zfWe9RsZ&fP7QSNoGubV=A-aWVM#TXAG3^-LF?mX~#{Y41evx31;M^d;^rY$a;ThGj
zhUfIj-6rYe>gB{2Om`PPEHbnTms=SkDzEDQV6GJy5B`L-?{C6y><5|%8T)dRX2o=u
zbyKiTKW44WZ)rOGto)!@eb%qvImO)*_=TAW=<~u133EZ#7lo;w;r<B*S&|mBF68pl
VBm*R)j0N)h+MT{YhHyS?{sl*N2hacj

literal 0
HcmV?d00001

diff --git a/target/classes/Student.class b/target/classes/Student.class
index 6e08ad55a30920967de2b288dea7de2bca5de24a..d79dc7b2c113e30574a0405b006095748bbbe402 100644
GIT binary patch
delta 376
zcmXYrO-{m46ot?2E0)p+LJ|2<ApV<L#EAoA(1D4Gi8EHv*oHu$CKMc*xCO|IQ(c6?
z7}uaXa1X|@6W?pi9o&<1@A-0O*36onWHU&^G?3x2z~|4$=`?a2%gE2awjXR14XkjK
zuu3qxlc^ts6M`8f>dGhB*8}g)YY)A!*X~Zn{jhgx!bXLoszQ3`jRIw?ajeG_&-cec
z6e+L4(Ntb47<v7nayB?Nu|-(Axt)%qmtDG~9UB^el)TCsQfZ1DZwZXIgowGeS9*i-
zitGXf=U{=d<1SEhTH;fynmKS3kwry(YxSnelT0>LrI_AOMZl!%ATNGckqY9R?Ng%5
x;+}P=EZ&)GC0WAZ|6fg{^bXa;h3;C4Mskjln>b?y@uat?E<SXZsg}R`;~)LwKf3?`

delta 386
zcmXX>O-sW-5Pg%RBx$y_pSIQ7UMfP2)~iTQdMOAVO3$*8P%3SNHuWTU@T{~f{t~H(
zzd?VCc=qCKDho5SGw;25v-FnU^7O%l1J_1Yz=I&zgJcm#aYC?SIgJRV%NuzoyAv6Y
zx`Sjkjz?#jk{8%Y@iGi&(R{9ZMS+s;WumDZPqL_>YGYfVhB_gi$}E!cq&pn;F9_M0
zjKka2b<?R}M_?Dt)nljTpe4}OD(-yaq#v^OYmJ7q@4x_%;Vq2d%Fv$E%wE#W`_;-g
zs2;9i`@tGH|7eYZ|Bmt-8tThvxGp2}$f2yhjlH(!6Ej=-npC}|Z-B{NA5HaRmerG0
zR99x5(jVFC-t2MwFavMHCLC{&lv5e2$MM_>JgrCkPX1>F^~|$^`m_R5yZp6Y{s6Py
BLZkoy


From c4e6ef24cbdea4270ccf3c76666724e0e1f92bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Mon, 26 Feb 2024 22:13:38 +0100
Subject: [PATCH 20/22] Create enroll and assign classes

---
 src/main/java/Commands.java | 16 +++++++++++++---
 src/main/java/Course.java   |  6 ++++++
 2 files changed, 19 insertions(+), 3 deletions(-)

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index fbca649..85d9773 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -41,10 +41,11 @@ public void commandSelector(CommandEnum commandAction){
         String studentID = "asdfasdf";
         String courseID = "asdfasdf";
         String teacherID = "asdfasdf";
+
         switch (commandAction){
         case ENROLL:
-
             enroll(studentID,courseID);
+
             break;
         case ASSIGN:
             assign(teacherID,courseID);
@@ -76,11 +77,20 @@ public void commandSelector(CommandEnum commandAction){
         }
     }
 
-    public void enroll(String studentID, String courseID){ // This command will help enroll the student specified in the corresponding course. While also updating the money_earned of that course based on its price
+    public void enroll(Student studentID, Course courseID) {
+        Course course = courseID;
+        Student student = studentID;
+
+        courseID.courseEnroll(studentID, courseID);
+
+        // Increase money earned
+        courseID.setMoney_earned(courseID.getMoney_earned() + courseID.getPrice());
     }
 
-    public void assign(String teacherID,String courseID){   //This command will help assign the teacher specified to the corresponding course
+    public void assign(Teacher teacherID,Course courseID){   //This command will help assign the teacher specified to the corresponding course
+        Teacher teacher = teacherID;
 
+        courseID.setTeacher(teacherID);
     }
 
     public void ShowCourses(){    //This command will display a list of all courses
diff --git a/src/main/java/Course.java b/src/main/java/Course.java
index 3503218..5445443 100644
--- a/src/main/java/Course.java
+++ b/src/main/java/Course.java
@@ -1,4 +1,5 @@
 
+import java.util.HashMap;
 import java.util.UUID;
 public class Course {
     private String courseId;
@@ -8,6 +9,7 @@ public class Course {
     private double price;
     private double money_earned;
     private Teacher teacher;
+    private HashMap<String, Course> courseList = new HashMap<String, Course>();
 
 
     public Course(String courseId, String name, double price, double money_earned) {
@@ -56,4 +58,8 @@ public Teacher getTeacher() {
     public void setTeacher(Teacher teacher) {
         this.teacher = teacher;
     }
+
+    public void courseEnroll(Student student, Course x){
+        courseList.put(student.getStudentId(), x);
+    }
 }

From 33e71348c1e2716cdf5ddb1e6691bf69c70c79f7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Thu, 29 Feb 2024 19:01:28 +0100
Subject: [PATCH 21/22] commands 3 to 8 advance

---
 src/main/java/Commands.java | 37 +++++++++++++++++++++++++++++++++----
 1 file changed, 33 insertions(+), 4 deletions(-)

diff --git a/src/main/java/Commands.java b/src/main/java/Commands.java
index 85d9773..a34d77a 100644
--- a/src/main/java/Commands.java
+++ b/src/main/java/Commands.java
@@ -1,3 +1,4 @@
+import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.Map;
 
@@ -50,27 +51,35 @@ public void commandSelector(CommandEnum commandAction){
         case ASSIGN:
             assign(teacherID,courseID);
             break;
+
         case SHOW_COURSES:
             ShowCourses();
             break;
+
         case LOOKUP_COURSE:
             LookupCourse(courseID);
             break;
+
         case SHOW_STUDENTS:
             ShowStudents();
             break;
+
         case LOOKUP_STUDENT:
             LookupStudent(studentID);
             break;
+
         case SHOW_TEACHERS:
             ShowTeachers();
             break;
+
         case LOOKUP_TEACHER:
             LookupTeacher(teacherID);
             break;
+
         case SHOW_PROFIT:
             ShowProfit();
             break;
+
         default:
             System.err.println("The command selected is not available");
             break;
@@ -94,27 +103,47 @@ public void assign(Teacher teacherID,Course courseID){   //This command will hel
     }
 
     public void ShowCourses(){    //This command will display a list of all courses
-
+        for (Course course : courseList.values()){
+            System.out.println(course.getName());
+        };
     }
 
     public void LookupCourse(String courseID){ // This command will display the full details of the specified course
+        Course x = courseList.get(courseID);
 
+        System.out.println(x.getName());
+        System.out.println(x.getPrice());
+        System.out.println(x.getTeacher());
+        System.out.println(x.getClass());
     }
 
     public void ShowStudents(){ //This command will display a list of all students
-
+        for (Student student : studentList.values()){
+            System.out.println(student.getName());
+        }
     }
 
-    public void LookupStudent(String studentID){ //This command will display the full details of the specified student
+    public void LookupStudent(Student studentID){ //This command will display the full details of the specified student
+        Student student = studentList.get(studentID);
 
+        System.out.println(student.getName());
+        System.out.println(student.getAddress());
+        System.out.println(student.getCourse());
+        System.out.println(student.getEmail());
     }
 
     public void ShowTeachers(){ //This command will display a list of all teachers
-
+        for (Teacher teacher : teacherList.values()){
+            System.out.println(teacher.getName());
+        }
     }
 
     public void LookupTeacher(String teacherID){ // This command will display the full details of the specified teacher
+        Teacher teacher = teacherList.get(teacherID);
 
+        System.out.println(teacher.getName());
+        System.out.println(teacher.getSalary());
+        System.out.println(teacher.getClass());
     }
 
     public void ShowProfit(){ //This command will calculate (The total money earned from all courses) - (The sum of all the teachers' salaries) and return the result

From 9bd1eed50a56d3e1f90a0af7fdb31ac749a6aa36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E2=80=9Cwardin231=E2=80=9D?= <didiazhernandez@gmail.com>
Date: Thu, 29 Feb 2024 19:03:28 +0100
Subject: [PATCH 22/22] setMoneyEarned changed

---
 src/main/java/Course.java | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/main/java/Course.java b/src/main/java/Course.java
index 5445443..b8e9f95 100644
--- a/src/main/java/Course.java
+++ b/src/main/java/Course.java
@@ -16,7 +16,6 @@ public Course(String courseId, String name, double price, double money_earned) {
         setCourseId(courseId);
         setName(name);
         setPrice(price);
-        setMoney_earned(money_earned);
     }
 
     public String getCourseId() {