pom.xml

@@ -43,8 +43,29 @@
             <artifactId>mysql-connector-java</artifactId>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-core</artifactId>
+            <version>5.0.6.RELEASE</version>
+        </dependency>
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt</artifactId>
+			<version>0.2</version>
+		</dependency>
+        <dependency>
+            <groupId>org.springframework.security</groupId>
+            <artifactId>spring-security-web</artifactId>
+            <version>5.0.6.RELEASE</version>
+        </dependency>
+		<dependency>
+			<groupId>org.springframework.security</groupId>
+			<artifactId>spring-security-config</artifactId>
+			<version>5.0.6.RELEASE</version>
+		</dependency>
+
 
-        <!--<dependency>-->
+		<!--<dependency>-->
             <!--<groupId>com.h2database</groupId>-->
             <!--<artifactId>h2</artifactId>-->
         <!--</dependency>-->

src/main/java/com/passionproject/project_spitball20/Application.java

@@ -2,6 +2,8 @@ package com.passionproject.project_spitball20;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
+import org.springframework.context.annotation.Bean;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 
 @SpringBootApplication
 public class Application {
@@ -9,4 +11,9 @@ public class Application {
 	public static void main(String[] args) {
 		SpringApplication.run(Application.class, args);
 	}
+
+	@Bean
+	public BCryptPasswordEncoder bCryptPasswordEncoder() {
+		return new BCryptPasswordEncoder();
+	}
 }

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

@@ -0,0 +1,64 @@
+package com.passionproject.project_spitball20.JWT;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import io.jsonwebtoken.Jwts;
+import io.jsonwebtoken.SignatureAlgorithm;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.Authentication;
+import org.springframework.security.core.AuthenticationException;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Date;
+
+import static com.passionproject.project_spitball20.JWT.SecurityConstants.EXPIRATION_TIME;
+import static com.passionproject.project_spitball20.JWT.SecurityConstants.HEADER_STRING;
+import static com.passionproject.project_spitball20.JWT.SecurityConstants.SECRET;
+import static com.passionproject.project_spitball20.JWT.SecurityConstants.TOKEN_PREFIX;
+
+public class JWTAuthenticationFilter extends UsernamePasswordAuthenticationFilter {
+    private AuthenticationManager authenticationManager;
+
+    public JWTAuthenticationFilter(AuthenticationManager authenticationManager) {
+        this.authenticationManager = authenticationManager;
+    }
+
+    @Override
+    public Authentication attemptAuthentication(HttpServletRequest req,
+                                                HttpServletResponse res) throws AuthenticationException {
+        try {
+            com.passionproject.project_spitball20.model.User creds = new ObjectMapper()
+                    .readValue(req.getInputStream(), com.passionproject.project_spitball20.model.User.class);
+
+            return authenticationManager.authenticate(
+                    new UsernamePasswordAuthenticationToken(
+                            creds.getUsername(),
+                            creds.getPassword(),
+                            new ArrayList<>())
+            );
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    @Override
+    protected void successfulAuthentication(HttpServletRequest req,
+                                            HttpServletResponse res,
+                                            FilterChain chain,
+                                            Authentication auth) throws IOException, ServletException {
+
+        String token = Jwts.builder()
+                .setSubject(((User) auth.getPrincipal()).getUsername())
+                .setExpiration(new Date(System.currentTimeMillis() + EXPIRATION_TIME))
+                .signWith(SignatureAlgorithm.HS512, SECRET.getBytes())
+                .compact();
+        res.addHeader(HEADER_STRING, TOKEN_PREFIX + token);
+    }
+}

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

@@ -0,0 +1,60 @@
+package com.passionproject.project_spitball20.JWT;
+
+import io.jsonwebtoken.Jwts;
+import org.springframework.security.authentication.AuthenticationManager;
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
+import org.springframework.security.core.context.SecurityContextHolder;
+import org.springframework.security.web.authentication.www.BasicAuthenticationFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+import java.util.ArrayList;
+
+import static  com.passionproject.project_spitball20.JWT.SecurityConstants.HEADER_STRING;
+import static  com.passionproject.project_spitball20.JWT.SecurityConstants.SECRET;
+import static  com.passionproject.project_spitball20.JWT.SecurityConstants.TOKEN_PREFIX;
+
+public class JWTAuthorizationFilter extends BasicAuthenticationFilter {
+
+    public JWTAuthorizationFilter(AuthenticationManager authManager) {
+        super(authManager);
+    }
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest req,
+                                    HttpServletResponse res,
+                                    FilterChain chain) throws IOException, ServletException {
+        String header = req.getHeader(HEADER_STRING);
+
+        if (header == null || !header.startsWith(TOKEN_PREFIX)) {
+            chain.doFilter(req, res);
+            return;
+        }
+
+        UsernamePasswordAuthenticationToken authentication = getAuthentication(req);
+
+        SecurityContextHolder.getContext().setAuthentication(authentication);
+        chain.doFilter(req, res);
+    }
+
+    private UsernamePasswordAuthenticationToken getAuthentication(HttpServletRequest request) {
+        String token = request.getHeader(HEADER_STRING);
+        if (token != null) {
+            // parse the token.
+            String user = Jwts.parser()
+                    .setSigningKey(SECRET.getBytes())
+                    .parseClaimsJws(token.replace(TOKEN_PREFIX, ""))
+                    .getBody()
+                    .getSubject();
+
+            if (user != null) {
+                return new UsernamePasswordAuthenticationToken(user, null, new ArrayList<>());
+            }
+            return null;
+        }
+        return null;
+    }
+}

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

@@ -0,0 +1,12 @@
+package com.passionproject.project_spitball20.JWT;
+
+public class SecurityConstants {
+
+    public static final String SECRET = "SecretKeyToGenJWTs";
+    public static final long EXPIRATION_TIME = 864_000_000; // 10 days
+    public static final String TOKEN_PREFIX = "Bearer ";
+    public static final String HEADER_STRING = "Authorization";
+    public static final String SIGN_UP_URL = "/user_profile/register_user";
+
+
+}

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

@@ -0,0 +1,54 @@
+package com.passionproject.project_spitball20.JWT;
+
+import org.springframework.http.HttpMethod;
+import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
+import org.springframework.security.config.annotation.web.builders.HttpSecurity;
+import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
+import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
+import org.springframework.security.config.http.SessionCreationPolicy;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+import org.springframework.web.cors.CorsConfiguration;
+import org.springframework.web.cors.CorsConfigurationSource;
+import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
+import org.springframework.context.annotation.Bean;
+
+import static  com.passionproject.project_spitball20.JWT.SecurityConstants.SIGN_UP_URL;
+
+@EnableWebSecurity
+public class WebSecurity extends WebSecurityConfigurerAdapter {
+    private UserDetailsService userDetailsService;
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
+
+    public WebSecurity(UserDetailsService userDetailsService, BCryptPasswordEncoder bCryptPasswordEncoder) {
+        this.userDetailsService = userDetailsService;
+        this.bCryptPasswordEncoder = bCryptPasswordEncoder;
+    }
+
+    @Override
+    protected void configure(HttpSecurity http) throws Exception {
+        http.cors().and().csrf().disable().authorizeRequests()
+                .antMatchers(HttpMethod.POST, SIGN_UP_URL).permitAll()
+                .anyRequest().authenticated()
+                .and()
+                .addFilter(new JWTAuthenticationFilter(authenticationManager()))
+                .addFilter(new JWTAuthorizationFilter(authenticationManager()))
+                // this disables session creation on Spring Security
+                .sessionManagement().sessionCreationPolicy(SessionCreationPolicy.STATELESS);
+    }
+
+    @Override
+    public void configure(AuthenticationManagerBuilder auth) throws Exception {
+        auth.userDetailsService(userDetailsService).passwordEncoder(bCryptPasswordEncoder);
+    }
+
+    @Bean
+    CorsConfigurationSource corsConfigurationSource() {
+        final UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
+        CorsConfiguration cors = new CorsConfiguration().applyPermitDefaultValues();
+        cors.addExposedHeader("Authorization");
+
+        source.registerCorsConfiguration("/**", cors);
+        return source;
+    }
+}

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

@@ -1,42 +0,0 @@
-package com.passionproject.project_spitball20.controller;
-
-import com.passionproject.project_spitball20.model.User;
-import com.passionproject.project_spitball20.service.UserService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-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.*;
-
-@CrossOrigin(origins = "http://localhost:8100")
-@RestController
-//@RequestMapping("user_profile")
-public class UserController {
-
-    @Autowired
-    UserService userService;
-
-    public static final Logger logger = LoggerFactory.getLogger(UserController.class);
-
-
-    @RequestMapping(value = "/register_user", method = RequestMethod.POST)
-    public ResponseEntity<User> registerUser(@RequestBody User newUser) {
-        User user = new User();
-        HttpStatus status = HttpStatus.CONFLICT;
-        if(userService.findEmail(newUser.getEmail()) == null){ //&& userService.findName(newUser.getDisplayName()).equals(null)) {
-            user = userService.save(newUser);
-            status  = HttpStatus.CREATED;
-        }
-
-        return new ResponseEntity<>(user, new HttpHeaders(), status);
-
-    }
-
-    @RequestMapping(value = "/delete_profile", method = RequestMethod.DELETE)
-    public ResponseEntity<User> deleteMessage(@RequestBody User user) {
-        userService.delete(user);
-        return new ResponseEntity<>(HttpStatus.OK);
-    }
-}

src/main/java/com/passionproject/project_spitball20/controller/TeacherController.java → src/main/java/com/passionproject/project_spitball20/controller/profiles/TeacherProfileController.java

@@ -1,10 +1,8 @@
-package com.passionproject.project_spitball20.controller;
+package com.passionproject.project_spitball20.controller.profiles;
 
 
 import com.passionproject.project_spitball20.model.Teacher;
-import com.passionproject.project_spitball20.model.User;
 import com.passionproject.project_spitball20.service.TeacherService;
-import com.passionproject.project_spitball20.service.UserService;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -15,21 +13,21 @@ import org.springframework.web.bind.annotation.*;
 
 
 @RestController
-@RequestMapping("teacher_profile")
+@RequestMapping("teachers")
 @CrossOrigin(origins = "http://localhost:8100")
-public class TeacherController {
+public class TeacherProfileController {
 
     @Autowired
     TeacherService teacherService;
 
-    public static final Logger logger = LoggerFactory.getLogger(UserController.class);
+    public static final Logger logger = LoggerFactory.getLogger(TeacherProfileController.class);
 
 
     @RequestMapping(value = "/register", method = RequestMethod.POST)
-    public ResponseEntity<Teacher> registerUser(@RequestBody Teacher newTeacher) {
+    public ResponseEntity<Teacher> registerTeacher(@RequestBody Teacher newTeacher) {
         Teacher teacher = new Teacher();
         HttpStatus status = HttpStatus.CONFLICT;
-        if(teacherService.findEmail(newTeacher.getEmail()).equals(null)){
+        if(teacherService.findEmail(newTeacher.getEmail()) == (null)){
             teacher = teacherService.save(newTeacher);
             status  = HttpStatus.CREATED;
         }
@@ -38,14 +36,27 @@ public class TeacherController {
 
     }
 
+    @RequestMapping(value = "/find_all", method = RequestMethod.HEAD)
+    public ResponseEntity<?> getAllTeachers() {
+        HttpStatus status = HttpStatus.OK;
+        return new ResponseEntity<>(teacherService.findAll(), new HttpHeaders(), status);
+    }
+
+    @RequestMapping(value = "/find_teacher", method = RequestMethod.GET)
+    public ResponseEntity<Teacher> getTeacher(@RequestBody Teacher teacher) {
+        HttpStatus httpStatus = HttpStatus.OK;
+        teacher = teacherService.find(teacher.getId());
+        return new ResponseEntity<>(teacher, new HttpHeaders(), httpStatus);
+    }
+
     @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public ResponseEntity<Teacher> deleteRating(@RequestBody Teacher teacher) {
+    public ResponseEntity<Teacher> deleteTeacherProfile(@RequestBody Teacher teacher) {
         teacherService.delete(teacher);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.PUT)
-    public ResponseEntity<Teacher> updateRating(@RequestBody Teacher teacher) {
+    public ResponseEntity<Teacher> updateTeacherProfile(@RequestBody Teacher teacher) {
         HttpStatus httpStatus = HttpStatus.CREATED;
         teacher = this.teacherService.update(teacher);
 

src/main/java/com/passionproject/project_spitball20/controller/profiles/UserProfileController.java

@@ -0,0 +1,52 @@
+package com.passionproject.project_spitball20.controller.profiles;
+
+import com.passionproject.project_spitball20.model.User;
+import com.passionproject.project_spitball20.service.UserService;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+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.*;
+import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
+
+
+
+@RestController
+@RequestMapping("user_profile")
+@CrossOrigin(origins = "http://localhost:8100")
+public class UserProfileController {
+
+    @Autowired
+    UserService userService;
+
+    @Autowired
+    private BCryptPasswordEncoder bCryptPasswordEncoder;
+
+   //public static final Logger logger = LoggerFactory.getLogger(UserController.class);
+
+
+    @RequestMapping(value = "/find_user", method = RequestMethod.GET)
+    public ResponseEntity<User> getUser(@RequestParam (name = "user_id", required = true) Long userId) {
+        HttpStatus httpStatus = HttpStatus.OK;
+        return new ResponseEntity<>(userService.find(userId), new HttpHeaders(), httpStatus);
+    }
+
+    @RequestMapping(value = "/register_user", method = RequestMethod.POST)
+    public ResponseEntity<User> registerUser(@RequestBody User newUser) {
+        HttpStatus status = HttpStatus.CONFLICT;
+        if (userService.findEmail(newUser.getEmail()) == null) {
+            newUser.setPassword(bCryptPasswordEncoder.encode(newUser.getPassword()));
+            newUser = userService.save(newUser);
+            status = HttpStatus.CREATED;
+        }
+        return new ResponseEntity<>(newUser, new HttpHeaders(), status);
+    }
+
+    @RequestMapping(value = "/delete_profile", method = RequestMethod.DELETE)
+    public ResponseEntity<User> deleteMessage(@RequestBody User user) {
+        userService.delete(user);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

src/main/java/com/passionproject/project_spitball20/controller/ratings/SchoolRatingController.java

@@ -0,0 +1,56 @@
+//package com.passionproject.project_spitball20.controller;
+//
+//
+//import com.fasterxml.jackson.core.JsonProcessingException;
+//import com.fasterxml.jackson.databind.ObjectMapper;
+//import com.passionproject.project_spitball20.model.Rating;
+//import com.passionproject.project_spitball20.service.RatingService;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.http.HttpHeaders;
+//import org.springframework.http.HttpStatus;
+//import org.springframework.http.MediaType;
+//import org.springframework.http.ResponseEntity;
+//import org.springframework.web.bind.annotation.*;
+//
+//@RestController
+//@RequestMapping("ratings")
+//@CrossOrigin(origins = "http://localhost:8100")
+//public class SchoolRatingController {
+//
+//    @Autowired
+//    RatingService ratingService;
+//
+//    @RequestMapping(value = "/rate", method = RequestMethod.POST)
+//    public ResponseEntity<Rating> newRating(@RequestBody Rating newRating) {
+//        HttpStatus httpStatus = HttpStatus.CREATED;
+//        Rating rate = this.ratingService.save(newRating);
+//
+//        return new ResponseEntity<>(rate, new HttpHeaders(), httpStatus);
+//    }
+//    @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
+//    public ResponseEntity<Rating> deleteRating(@RequestBody Rating rating) {
+//        ratingService.delete(rating);
+//        return new ResponseEntity<>(HttpStatus.OK);
+//    }
+//
+//    @RequestMapping(value = "/update", method = RequestMethod.PUT)
+//    public ResponseEntity<Rating> updateRating(@RequestBody Rating rating) {
+//        HttpStatus httpStatus = HttpStatus.CREATED;
+//        rating = this.ratingService.update(rating);
+//
+//        return new ResponseEntity<>(rating, new HttpHeaders(), httpStatus);
+//    }
+//
+//    @RequestMapping(value = "/get_all_ratings", method = RequestMethod.GET)
+//    public ResponseEntity<?> getAllRatings() throws JsonProcessingException {
+//        ObjectMapper objectMapper = new ObjectMapper();
+//        HttpStatus httpStatus = HttpStatus.CREATED;
+//        HttpHeaders header = new HttpHeaders();
+//
+//        String messageJSON = objectMapper.writeValueAsString(this.ratingService.getAllRatings());
+//        header.setContentType(MediaType.APPLICATION_JSON);
+//
+//        return new ResponseEntity<>(messageJSON, header, httpStatus);
+//    }
+//
+//}

src/main/java/com/passionproject/project_spitball20/controller/RatingController.java → src/main/java/com/passionproject/project_spitball20/controller/ratings/TeacherRatingController.java

@@ -1,11 +1,10 @@
-package com.passionproject.project_spitball20.controller;
+package com.passionproject.project_spitball20.controller.ratings;
 
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import com.passionproject.project_spitball20.model.Rating;
-import com.passionproject.project_spitball20.model.messages.Review;
-import com.passionproject.project_spitball20.service.RatingService;
+import com.passionproject.project_spitball20.model.ratings.TeacherRating;
+import com.passionproject.project_spitball20.service.ratings.TeacherRatingService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.http.HttpHeaders;
 import org.springframework.http.HttpStatus;
@@ -16,26 +15,26 @@ import org.springframework.web.bind.annotation.*;
 @RestController
 @RequestMapping("ratings")
 @CrossOrigin(origins = "http://localhost:8100")
-public class RatingController {
+public class TeacherRatingController {
 
     @Autowired
-    RatingService ratingService;
+    TeacherRatingService ratingService;
 
     @RequestMapping(value = "/rate", method = RequestMethod.POST)
-    public ResponseEntity<Rating> newRating(@RequestBody Rating newRating) {
+    public ResponseEntity<TeacherRating> newRating(@RequestBody TeacherRating newRating) {
         HttpStatus httpStatus = HttpStatus.CREATED;
-        Rating rate = this.ratingService.save(newRating);
+        TeacherRating rate = this.ratingService.save(newRating);
 
         return new ResponseEntity<>(rate, new HttpHeaders(), httpStatus);
     }
     @RequestMapping(value = "/delete", method = RequestMethod.DELETE)
-    public ResponseEntity<Rating> deleteRating(@RequestBody Rating rating) {
+    public ResponseEntity<TeacherRating> deleteRating(@RequestBody TeacherRating rating) {
         ratingService.delete(rating);
         return new ResponseEntity<>(HttpStatus.OK);
     }
 
     @RequestMapping(value = "/update", method = RequestMethod.PUT)
-    public ResponseEntity<Rating> updateRating(@RequestBody Rating rating) {
+    public ResponseEntity<TeacherRating> updateRating(@RequestBody TeacherRating rating) {
         HttpStatus httpStatus = HttpStatus.CREATED;
         rating = this.ratingService.update(rating);
 

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

@@ -0,0 +1,51 @@
+package com.passionproject.project_spitball20.controller.school;
+
+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(Long id) {
+        HttpStatus status = HttpStatus.OK;
+        return new ResponseEntity<>(teacherService.findAllBySchool(id), 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/school/SchoolWallController.java

@@ -0,0 +1,58 @@
+package com.passionproject.project_spitball20.controller.school;
+
+import com.passionproject.project_spitball20.model.School;
+import com.passionproject.project_spitball20.model.messages.Comment;
+import com.passionproject.project_spitball20.model.messages.Review;
+import com.passionproject.project_spitball20.repositories.SchoolRepository;
+import com.passionproject.project_spitball20.repositories.messages.CommentRepository;
+import com.passionproject.project_spitball20.service.messages.CommentService;
+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("bulletin_board")
+@CrossOrigin(origins = "http://localhost:8100")
+public class SchoolWallController {
+
+    @Autowired
+    SchoolRepository schoolRepo;
+
+    @Autowired
+    CommentService commentService;
+
+    @RequestMapping(value = "/post", method = RequestMethod.POST)
+    public ResponseEntity<?> postToBoard(@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 = "/delete", method = RequestMethod.DELETE)
+//    public ResponseEntity<?> deletePost(@RequestBody Review review) {
+//        reviewService.delete(review);
+//        return new ResponseEntity<>(HttpStatus.OK);
+//    }
+
+    @RequestMapping(value = "/post_comment", method = RequestMethod.POST)
+    public ResponseEntity<?> postReview(@RequestBody Comment newComment) {
+        HttpStatus httpStatus = HttpStatus.CREATED;
+        Comment comment  = commentService.save(newComment);
+
+        return new ResponseEntity<>(comment, new HttpHeaders(), httpStatus);
+    }
+
+
+    @RequestMapping(value = "/delete_comment", method = RequestMethod.DELETE)
+    public ResponseEntity<?> deleteComment(@RequestBody Comment comment) {
+        commentService.delete(comment);
+        return new ResponseEntity<>(HttpStatus.OK);
+    }
+}

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

@@ -0,0 +1,42 @@
+package com.passionproject.project_spitball20.model;
+
+
+import javax.persistence.*;
+import java.util.List;
+
+@Entity
+public class School {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    private String name;
+
+    @OneToMany(cascade = CascadeType.ALL, mappedBy = "schoolId")
+    private List<Teacher> teachers;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public List<Teacher> getTeachers() {
+        return teachers;
+    }
+
+    public void setTeachers(List<Teacher> teachers) {
+        this.teachers = teachers;
+    }
+}

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

@@ -1,6 +1,7 @@
 package com.passionproject.project_spitball20.model;
 
-import org.hibernate.engine.internal.Cascade;
+import com.passionproject.project_spitball20.model.messages.Comment;
+import com.passionproject.project_spitball20.model.ratings.TeacherRating;
 
 import javax.persistence.*;
 import java.util.List;
@@ -19,9 +20,29 @@ public class Teacher {
     String password;
 
     @OneToMany(cascade = CascadeType.ALL)
-    @JoinColumn(name = "teacherId")
-    private List<Rating> ratings;
+    @JoinColumn
+    private List<TeacherRating> ratings;
 
+    @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;
@@ -64,14 +85,14 @@ public class Teacher {
     }
 
     public String getFullName() {
-        return firstName + lastName;
+        return firstName + " " + lastName;
     }
 
-    public List<Rating> getRatings() {
+    public List<TeacherRating> getRatings() {
         return ratings;
     }
 
-    public void setRatings(List<Rating> ratings) {
+    public void setRatings(List<TeacherRating> ratings) {
         this.ratings = ratings;
     }
 }

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

@@ -1,6 +1,9 @@
 package com.passionproject.project_spitball20.model;
 
+import com.passionproject.project_spitball20.model.messages.Review;
+
 import javax.persistence.*;
+import java.util.List;
 
 @Entity
 @Table
@@ -8,17 +11,27 @@ public class User {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
-     private Long id;
+    private Long id;
+
+    String firstName;
+
+    String lastName;
+
+    String username;
 
-     String firstName;
+    String email;
 
-     String lastName;
+    String password;
 
-     String displayName;
+    @OneToMany
+    List<Review> reviews;
 
-     String email;
+    public User() {
+    }
 
-     String password;
+    public User(String username, String password, List<User> user) {
+        this.username = username; this.password = password;
+    }
 
     public Long getId() {
         return id;
@@ -44,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() {
@@ -67,4 +80,6 @@ public class User {
     public void setPassword(String password) {
         this.password = password;
     }
+
+
 }

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

@@ -0,0 +1,28 @@
+package com.passionproject.project_spitball20.model;
+
+
+import com.passionproject.project_spitball20.repositories.UserRepository;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import org.springframework.stereotype.Service;
+
+import static java.util.Collections.emptyList;
+
+@Service
+public class UserDetailsServiceImpl implements UserDetailsService {
+    private UserRepository userRepository;
+
+    public UserDetailsServiceImpl(UserRepository userRepository) {
+        this.userRepository = userRepository;
+    }
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        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.getUsername(), user.getPassword(), emptyList());
+    }
+}

src/main/java/com/passionproject/project_spitball20/model/ratings/SchoolRating.java

@@ -0,0 +1,42 @@
+package com.passionproject.project_spitball20.model.ratings;
+
+
+import javax.persistence.*;
+
+@Entity
+public class SchoolRating {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    private Long id;
+
+    @JoinColumn
+    Long schoolId;
+
+    Integer rating;
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public Long getSchoolId() {
+        return schoolId;
+    }
+
+    public void setSchoolId(Long schoolId) {
+        this.schoolId = schoolId;
+    }
+
+    public Integer getRating() {
+        return rating;
+    }
+
+    public void setRating(Integer rating) {
+        this.rating = rating;
+    }
+
+}

src/main/java/com/passionproject/project_spitball20/model/Rating.java → src/main/java/com/passionproject/project_spitball20/model/ratings/TeacherRating.java

@@ -1,4 +1,4 @@
-package com.passionproject.project_spitball20.model;
+package com.passionproject.project_spitball20.model.ratings;
 
 import com.passionproject.project_spitball20.model.messages.Review;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -7,12 +7,13 @@ import javax.persistence.*;
 
 
 @Entity
-public class Rating {
+public class TeacherRating {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     private Long id;
 
+    @JoinColumn
     Long teacherId;
 
     Integer rating;

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

@@ -1,10 +0,0 @@
-package com.passionproject.project_spitball20.repositories;
-
-import com.passionproject.project_spitball20.model.Rating;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.stereotype.Repository;
-
-
-@Repository
-public interface RatingRepository extends JpaRepository<Rating, Long> {
-}

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/TeacherRepository.java

@@ -4,10 +4,14 @@ import com.passionproject.project_spitball20.model.Teacher;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.stereotype.Repository;
 
+import java.util.List;
+
 @Repository
 public interface TeacherRepository extends JpaRepository<Teacher, Long> {
 
     Teacher findByEmail(String email);
 
+    List<Teacher> findAllBySchoolId(Long id);
+
     //Teacher findByName(String fullName);
 }

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

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

src/main/java/com/passionproject/project_spitball20/repositories/ratings/SchoolRatingRepository.java

@@ -0,0 +1,11 @@
+//package com.passionproject.project_spitball20.repositories;
+//
+//import com.passionproject.project_spitball20.model.Rating;
+//import com.passionproject.project_spitball20.model.ratings.SchoolRating;
+//import org.springframework.data.jpa.repository.JpaRepository;
+//import org.springframework.stereotype.Repository;
+//
+//
+//@Repository
+//public interface SchoolRatingRepository extends JpaRepository<SchoolRating, Long> {
+//}

src/main/java/com/passionproject/project_spitball20/repositories/ratings/TeacherRatingRepository.java

@@ -0,0 +1,10 @@
+package com.passionproject.project_spitball20.repositories.ratings;
+
+import com.passionproject.project_spitball20.model.ratings.TeacherRating;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+
+@Repository
+public interface TeacherRatingRepository extends JpaRepository<TeacherRating, Long> {
+}

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

@@ -1,33 +0,0 @@
-package com.passionproject.project_spitball20.service;
-
-import com.passionproject.project_spitball20.model.Rating;
-import com.passionproject.project_spitball20.repositories.RatingRepository;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-
-@Service
-public class RatingService {
-
-
-    @Autowired
-    RatingRepository ratingRepository;
-
-    public Rating save(Rating rating) {
-        return ratingRepository.saveAndFlush(rating);
-    }
-
-    public Rating update(Rating rating) {
-        return ratingRepository.save(rating);
-    }
-
-    public void delete(Rating rating) {
-        ratingRepository.delete(rating);
-    }
-
-    public Rating find(Long id) {
-        return ratingRepository.findById(id).get();
-    }
-
-    public Object getAllRatings() { return ratingRepository.findAll(); }
-
-}

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

@@ -5,12 +5,16 @@ import com.passionproject.project_spitball20.repositories.TeacherRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class TeacherService {
 
     @Autowired
     TeacherRepository teacherRepository;
 
+    Teacher teacher;
+
     public Teacher save(Teacher teacher) {
         return teacherRepository.saveAndFlush(teacher);
     }
@@ -31,5 +35,12 @@ public class TeacherService {
         return teacherRepository.findByEmail(email);
     }
 
+    public List<Teacher> findAllBySchool(Long id) {
+        id = teacher.getSchoolId();
+        return teacherRepository.findAllBySchoolId(id);
+    }
+
+    public List<Teacher> findAll() { return teacherRepository.findAll();
+    }
 
 }

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;
+    }
+
 
 }

src/main/java/com/passionproject/project_spitball20/service/ratings/SchoolRatingService.java

@@ -0,0 +1,40 @@
+//package com.passionproject.project_spitball20.service;
+//
+//import com.passionproject.project_spitball20.model.Rating;
+//import com.passionproject.project_spitball20.model.ratings.SchoolRating;
+//import com.passionproject.project_spitball20.model.Teacher;
+//import com.passionproject.project_spitball20.repositories.RatingRepository;
+//import com.passionproject.project_spitball20.repositories.SchoolRatingRepository;
+//import org.springframework.beans.factory.annotation.Autowired;
+//import org.springframework.stereotype.Service;
+//
+//import java.util.List;
+//
+//@Service
+//public class SchoolRatingService {
+//
+//
+//    @Autowired
+//    SchoolRatingRepository schoolRatingRepository;
+//
+//    public SchoolRating save(SchoolRating rating) {
+//        return schoolRatingRepository.saveAndFlush(rating);
+//    }
+//
+//    public SchoolRating update(SchoolRating rating) {
+//        return schoolRatingRepository.save(rating);
+//    }
+//
+//    public void delete(SchoolRating rating) {
+//        schoolRatingRepository.delete(rating);
+//    }
+//
+//    public SchoolRating find(Long id) {
+//        return schoolRatingRepository.findById(id).get();
+//    }
+//
+//    public List<SchoolRating> getAllTeachers(SchoolRating teacherId) { return schoolRatingRepository.findAllById(teacherId.getTeacherId());s }
+//
+//    public Object getAllRatings() { return schoolRatingRepository.findAll(); }
+//
+//}

src/main/java/com/passionproject/project_spitball20/service/ratings/TeacherRatingService.java

@@ -0,0 +1,33 @@
+package com.passionproject.project_spitball20.service.ratings;
+
+import com.passionproject.project_spitball20.model.ratings.TeacherRating;
+import com.passionproject.project_spitball20.repositories.ratings.TeacherRatingRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+@Service
+public class TeacherRatingService {
+
+
+    @Autowired
+    TeacherRatingRepository ratingRepository;
+
+    public TeacherRating save(TeacherRating rating) {
+        return ratingRepository.saveAndFlush(rating);
+    }
+
+    public TeacherRating update(TeacherRating rating) {
+        return ratingRepository.save(rating);
+    }
+
+    public void delete(TeacherRating rating) {
+        ratingRepository.delete(rating);
+    }
+
+//    public TeacherRating find(Long id) {
+//        return ratingRepository.findById(id).get();
+//    }
+
+    public Object getAllRatings() { return ratingRepository.findAll(); }
+
+}