src/main/java/com/passionproject/project_spitball20/JWT/JWTAuthenticationFilter.java

@@ -39,7 +39,7 @@ public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilte
 
             return authenticationManager.authenticate(
                     new UsernamePasswordAuthenticationToken(
-                            creds.getDisplayName(),
+                            creds.getUsername(),
                             creds.getPassword(),
                             new ArrayList<>())
             );

src/main/java/com/passionproject/project_spitball20/JWT/WebSecurity.java

@@ -45,7 +45,10 @@ public class WebSecurity extends WebSecurityConfigurerAdapter {
     @Bean
     CorsConfigurationSource corsConfigurationSource() {
         final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
-        source.registerCorsConfiguration("/**", new CorsConfiguration().applyPermitDefaultValues());
+        CorsConfiguration cors = new CorsConfiguration().applyPermitDefaultValues();
+        cors.addAllowedHeader("Authorization");
+
+        source.registerCorsConfiguration("/**", cors);
         return source;
     }
 }

src/main/java/com/passionproject/project_spitball20/controller/SchoolController.java

@@ -0,0 +1,51 @@
+package com.passionproject.project_spitball20.controller;
+
+import com.passionproject.project_spitball20.model.School;
+import com.passionproject.project_spitball20.model.Teacher;
+import com.passionproject.project_spitball20.repositories.SchoolRepository;
+import com.passionproject.project_spitball20.service.TeacherService;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpHeaders;
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("schools")
+@CrossOrigin(origins = "http://localhost:8100")
+public class SchoolController {
+
+    @Autowired
+    SchoolRepository schoolRepo;
+
+    @Autowired
+    private TeacherService teacherService;
+
+    @RequestMapping(value = "/post", method = RequestMethod.POST)
+    public ResponseEntity<School> postReview(@RequestBody School newSchool) {
+        School school = new School();
+        HttpStatus status = HttpStatus.CONFLICT;
+        if(schoolRepo.findByName(school.getName()) == null) {
+            school = schoolRepo.saveAndFlush(newSchool);
+            status  = HttpStatus.CREATED;
+        }
+
+        return new ResponseEntity<>(school, new HttpHeaders(), status);
+    }
+
+    @RequestMapping(value = "/getAll_Teacher", method = RequestMethod.HEAD)
+    public ResponseEntity<?> getAllTeachers() {
+        HttpStatus status = HttpStatus.OK;
+        return new ResponseEntity<>(teacherService.findAll(), new HttpHeaders(), status);
+    }
+
+    @RequestMapping(value = "/select_teacher", method = RequestMethod.GET)
+    public ResponseEntity<?> findTeachersBySchoolId(Long id) {
+        Teacher teacher = new Teacher();
+        HttpStatus status = HttpStatus.OK;
+        if(id == teacher.getSchoolId()) { teacher = teacherService.find(teacher.getSchoolId()); }
+        return new ResponseEntity<>(teacher , new HttpHeaders(), status);
+    }
+
+
+}

src/main/java/com/passionproject/project_spitball20/controller/SearchController.java

@@ -1,13 +0,0 @@
-package com.passionproject.project_spitball20.controller;
-
-import org.springframework.web.bind.annotation.CrossOrigin;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RestController;
-
-@RestController
-@RequestMapping("search")
-@CrossOrigin(origins = "http://localhost:8100")
-public class SearchController {
-
-
-}

src/main/java/com/passionproject/project_spitball20/controller/TeacherController.java

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 
 @RestController
-@RequestMapping("teacher_service")
+@RequestMapping("teachers")
 @CrossOrigin(origins = "http://localhost:8100")
 public class TeacherController {
 

src/main/java/com/passionproject/project_spitball20/model/School.java

@@ -1,6 +1,5 @@
 package com.passionproject.project_spitball20.model;
 
-import com.passionproject.project_spitball20.model.ratings.SchoolRating;
 
 import javax.persistence.*;
 import java.util.List;
@@ -14,9 +13,8 @@ public class School {
 
     private String name;
 
-    @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn
-    private List<SchoolRating> ratings;
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "schoolId")
+    private List<Teacher> teachers;
 
     public Long getId() {
         return id;
@@ -34,11 +32,4 @@ public class School {
         this.name = name;
     }
 
-    public List<SchoolRating> getRatings() {
-        return ratings;
-    }
-
-    public void setRatings(List<SchoolRating> ratings) {
-        this.ratings = ratings;
-    }
 }

src/main/java/com/passionproject/project_spitball20/model/Teacher.java

@@ -26,6 +26,23 @@ public class Teacher {
     @OneToMany
     private List<Comment> comments;
 
+    private Long schoolId;
+
+    public List<Comment> getComments() {
+        return comments;
+    }
+
+    public void setComments(List<Comment> comments) {
+        this.comments = comments;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
 
     public Long getId() {
         return id;

src/main/java/com/passionproject/project_spitball20/model/User.java

@@ -17,7 +17,7 @@ public class User {
 
     String lastName;
 
-    String displayName;
+    String username;
 
     String email;
 
@@ -29,8 +29,8 @@ public class User {
     public User() {
     }
 
-    public User(String displayName, String password, List<User> user) {
-        this.displayName = displayName; this.password = password;
+    public User(String username, String password, List<User> user) {
+        this.username = username; this.password = password;
     }
 
     public Long getId() {
@@ -57,12 +57,12 @@ public class User {
         this.lastName = lastName;
     }
 
-    public String getDisplayName() {
-        return displayName;
+    public String getUsername() {
+        return username;
     }
 
-    public void setDisplayName(String displayName) {
-        this.displayName = displayName;
+    public void setUsername(String username) {
+        this.username = username;
     }
 
     public String getEmail() {

src/main/java/com/passionproject/project_spitball20/model/UserDetailsServiceImpl.java

@@ -19,10 +19,10 @@ public class UserDetailsServiceImpl implements UserDetailsService {
 
     @Override
     public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
-        com.passionproject.project_spitball20.model.User user = userRepository.findByDisplayName(username);
+        com.passionproject.project_spitball20.model.User user = userRepository.findByUsername(username);
         if (user == null) {
             throw new UsernameNotFoundException(username);
         }
-        return new org.springframework.security.core.userdetails.User(user.getDisplayName(), user.getPassword(), emptyList());
+        return new org.springframework.security.core.userdetails.User(user.getUsername(), user.getPassword(), emptyList());
     }
 }

src/main/java/com/passionproject/project_spitball20/repositories/SchoolRepository.java

@@ -0,0 +1,9 @@
+package com.passionproject.project_spitball20.repositories;
+
+        import com.passionproject.project_spitball20.model.School;
+        import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface SchoolRepository extends JpaRepository<School, Long> {
+
+    School findByName(String name);
+}

src/main/java/com/passionproject/project_spitball20/repositories/UserRepository.java

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface UserRepository extends JpaRepository<User, Long> {
 
-   User findByDisplayName(String displayname);
+   User findByUsername(String username);
 
    User findByEmail(String email);
 

src/main/java/com/passionproject/project_spitball20/service/UserService.java

@@ -4,6 +4,8 @@ package com.passionproject.project_spitball20.service;
 import com.passionproject.project_spitball20.model.User;
 import com.passionproject.project_spitball20.repositories.UserRepository;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.context.SecurityContextHolder;
 import org.springframework.stereotype.Service;
 
 @Service
@@ -32,5 +34,10 @@ public class UserService {
         return userRepository.findById(id).get();
     }
 
+    public User getLoggedInUser(){
+        Authentication auth = SecurityContextHolder.getContext().getAuthentication();
+        return auth != null ? userRepository.findByEmail(auth.getName()) : null;
+    }
+
 
 }