teacher fully integrated

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

@@ -15,7 +15,7 @@ import org.springframework.web.bind.annotation.*;
 
 @CrossOrigin
 @RestController
-@RequestMapping("profile")
+@RequestMapping("teacher_profile")
 public class TeacherController {
 
     @Autowired
@@ -28,7 +28,7 @@ public class TeacherController {
     public ResponseEntity<Teacher> registerUser(@RequestBody Teacher newTeacher) {
         Teacher teacher = new Teacher();
         HttpStatus status = HttpStatus.CONFLICT;
-        if(teacherService.findEmail(newTeacher.getEmail()).equals(null) && teacherService.findName(newTeacher.getFullName()).equals(null)) {
+        if(teacherService.findEmail(newTeacher.getEmail()).equals(null)){ //&& teacherService.findName(newTeacher.getFullName()).equals(null)) {
             teacher = teacherService.save(newTeacher);
             status  = HttpStatus.CREATED;
         }

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

@@ -12,7 +12,7 @@ import org.springframework.web.bind.annotation.*;
 
 @CrossOrigin
 @RestController
-@RequestMapping("profile")
+@RequestMapping("user_profile")
 public class UserController {
 
     @Autowired
@@ -25,7 +25,7 @@ public class UserController {
     public ResponseEntity<User> registerUser(@RequestBody User newUser) {
         User user = new User();
         HttpStatus status = HttpStatus.CONFLICT;
-        if(userService.findEmail(newUser.getEmail()).equals(null) && userService.findName(newUser.getDisplayName()).equals(null)) {
+        if(userService.findEmail(newUser.getEmail()).equals(null)) { //&& userService.findName(newUser.getDisplayName()).equals(null)) {
             user = userService.save(newUser);
             status  = HttpStatus.CREATED;
         }

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

@@ -54,4 +54,8 @@ public class Teacher {
     public void setPassword(String password) {
         this.password = password;
     }
+
+    public String getFullName() {
+        return firstName + lastName;
+    }
 }

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

@@ -7,7 +7,7 @@ import org.springframework.stereotype.Repository;
 @Repository
 public interface TeacherRepository extends JpaRepository<Teacher, Long> {
 
-     Teacher findByEmail(String email);
+    Teacher findByEmail(String email);
 
-    Teacher findByName(String fullName);
+    //Teacher findByName(String fullName);
 }

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

@@ -9,6 +9,6 @@ public interface UserRepository extends JpaRepository<User, Long> {
 
    User findByEmail(String email);
 
-   User findByName(String fullName);
+   //User findByName(String fullName);
 
 }

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

@@ -23,9 +23,9 @@ public class TeacherService {
         return teacherRepository.findById(id).get();
     }
 
-    public Teacher findName(String fullName) {
-        return teacherRepository.findByName(fullName);
-    }
+//    public Teacher findName(String fullName) {
+//        return teacherRepository.findByName(fullName);
+//    }
 
     public Teacher findEmail(String email) {
         return teacherRepository.findByEmail(email);

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

@@ -24,9 +24,9 @@ public class UserService {
         return userRepository.findByEmail(email);
     }
 
-    public User findName(String displayName) {
-        return userRepository.findByName(displayName);
-    }
+//    public User findName(String displayName) {
+//        return userRepository.findByName(displayName);
+//    }
 
     public User find(Long id) {
         return userRepository.findById(id).get();