Kollier feature

.gitignore

@@ -19,9 +19,6 @@
 *.tar.gz
 *.rar
 
-# Resources
-# src/main/resources
-
 # IntelliJ
 \.idea
 
@@ -30,3 +27,4 @@ hs_err_pid*
 
 # ignore any .properties files
 *.properties
+/.jpb/

README.md

@@ -6,30 +6,41 @@ Team Vanquish Project 2 Implementation
 - [ ] Users are interfacing with an advanced UI built with Angular running in a browser
 - [ ] CRUD operations are supported for one or more domain objects via the web application's API endpoints
 - [ ] Client/Server communication is done with JSON in HTTP request and response bodies.
-- [ ] Client/Server communication is done with JSON in HTTP request and response bodies.
 - [ ] All low-level persistence logic is abstracted away with Hibernate/Spring Data
 - [ ] Documentation (all classes and methods have adequate Javadoc comments)
-- [ ] All Exceptions are caught and logged to a file
+- [ ] All VanquishP2.Exceptions are caught and logged to a file/database
 - [ ] Data useful to the application is retrieved from a third party API
 - [ ] Adequate test coverage for the service-layer
 - [ ] DevOps CI/CD pipeline is used to build and deploy project to a publicly available remote location
 
 
-## -- App Name Here --
-You will need to write a small paragraph describing your application. It should be 4-6 sentences and briefly cover the important points and features.
+## -- 4TheMusic --
 
-### Minimum Viable Product
-Your team will need to work with the trainer to come up with a satisfactory list of user stories for MVP as well as bonus stories. They should begin with "As a [stakeholder] I can... and describe what the user should be able to do. Aim for at least 2 different roles, user and administrator. Try to come up with 8 or so user stories for MVP. Carefully consider what your team can accomplish in 3 weeks and try not to set yourselves too great a task.
+"4TheMusic" is a social web service that brings music fans and concert-goers together with their favorite artists,
+while allowing premium users to gain valuable insights from user trends and analytics.
+
+Users can create and share playlists of their favorite songs and artists,
+along with viewing songs by similar artists and genres, and connecting to the social media accounts of their
+favorite artists.
 
-* As a user, I can see...
-* As a user, I can purchase...
-* As a user, I can check...
-* As an administrator, I can schedule...
-* As an administrator, I can cancel...
-* As an administrator, I can view...
+Premium users (concert organizers, artists, tour managers, etc.) can browse artists and see high-level, real-time analytics on
+the users that like particular artists.
+
+
+### Minimum Viable Product
+* As a user, I can create a playlist.
+* As a user, I can add or remove songs from a playlist.
+* As a user, I can rate a song with a like or dislike.
+* As a user, I can look up an album and see what songs are on it.
+* As a user, I can look up an artist and see a [limited] list of their songs.
+* As a premium user, I can schedule a concert.
+* As a premium user, I can cancel a concert.
+* As a premium user, I can see a list of liked songs for a user.
+* As a premium user, I can see a like/dislike ratio for a particular song.
 
 ### Bonus Stories
-* As an administrator, I can...
+* As a user, I can view a list of users who like the same songs.
+* As a premium user, I can see a like/dislike ratio for an entire artist.
 
 ## Tech Stack
 You should be employing the following technologies in your project.

pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.revature.vanquish</groupId>
 	<artifactId>P2</artifactId>
-	<version>0.0.1-SNAPSHOT</version>
+	<version>0.0.1</version>
 	<packaging>war</packaging>
 	<name>P2</name>
 	<description>Project 2 with Spring Boot Implementation</description>
@@ -22,30 +22,114 @@
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-validation</artifactId>
+			<version>2.5.5</version>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>org.mariadb.jdbc</groupId>
-			<artifactId>mariadb-java-client</artifactId>
-			<scope>runtime</scope>
-		</dependency>
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-tomcat</artifactId>
+			<version>2.5.5</version>
 			<scope>provided</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 		</dependency>
+
+		<dependency>
+			<groupId>com.vaadin.external.google</groupId>
+			<artifactId>android-json</artifactId>
+			<version>0.0.20131108.vaadin1</version>
+			<scope>compile</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-databind -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-databind</artifactId>
+			<version>2.13.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/com.fasterxml.jackson.core/jackson-core -->
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.13.0</version>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.mariadb.jdbc/mariadb-java-client -->
+		<dependency>
+			<groupId>org.mariadb.jdbc</groupId>
+			<artifactId>mariadb-java-client</artifactId>
+			<version>2.7.3</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- https://mvnrepository.com/artifact/org.json/json -->
+		<dependency>
+			<groupId>org.json</groupId>
+			<artifactId>json</artifactId>
+			<version>20210307</version>
+		</dependency>
+
+		<!-- JSON Web Token -->
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-api</artifactId>
+			<version>0.11.2</version>
+		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-impl</artifactId>
+			<version>0.11.2</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<dependency>
+			<groupId>io.jsonwebtoken</groupId>
+			<artifactId>jjwt-jackson</artifactId>
+			<version>0.11.2</version>
+			<scope>runtime</scope>
+		</dependency>
+
+		<!-- Mockito -->
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-core</artifactId>
+			<version>4.0.0</version>
+		</dependency>
+
+		<!-- H2 Testing Database -->
+		<dependency>
+			<groupId>com.h2database</groupId>
+			<artifactId>h2</artifactId>
+			<version>1.4.200</version>
+		</dependency>
+
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>okhttp</artifactId>
+            <version>4.9.2</version>
+        </dependency>
+		<dependency>
+			<groupId>junit</groupId>
+			<artifactId>junit</artifactId>
+			<version>4.13.2</version>
+			<scope>test</scope>
+		</dependency>
+
 	</dependencies>
 
 	<build>

src/main/java/VanquishP2/Application/Beans/Aspects/LoggerAspect.java

@@ -0,0 +1,52 @@
+package VanquishP2.Application.Beans.Aspects;
+
+import VanquishP2.Application.Beans.ModelServices.LoggerService;
+import org.aspectj.lang.JoinPoint;
+import org.aspectj.lang.ProceedingJoinPoint;
+import org.aspectj.lang.annotation.AfterThrowing;
+import org.aspectj.lang.annotation.Around;
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.stereotype.Component;
+
+/**
+ * LoggerAspect
+ * Logs all method calls and exceptions for all classes except filters.
+ *
+ * @author Kollier Martin
+ */
+
+
+@Aspect
+@Component
+public class LoggerAspect {
+    private final LoggerService loggerService;
+
+    public LoggerAspect(LoggerService loggerService) {
+        this.loggerService = loggerService;
+    }
+
+    @Pointcut("within(VanquishP2.*.*.*.*)")
+    public void logAll() {
+
+    }
+
+    @Around("within(VanquishP2.*.*.*.*)")
+    public void logAroundAll(ProceedingJoinPoint joinPoint) throws Throwable {
+        try {
+            joinPoint.proceed();
+        } catch (Exception ignored){
+
+        }
+    }
+
+    @AfterThrowing(pointcut = "logAll()", throwing = "e")
+    public void logMethodException(JoinPoint jp, Throwable e) {
+        String methodSig = extractMethodSignature(jp);
+        loggerService.writeLog(String.format("%s was thrown in method %s with message: %s", e.getClass().getSimpleName(), methodSig, e.getMessage()), 3);
+    }
+
+    private String extractMethodSignature(JoinPoint jp) {
+        return jp.getTarget().getClass().toString() + "." + jp.getSignature().getName();
+    }
+}

src/main/java/VanquishP2/Application/Beans/Filters/AuthenticationFilter.java

@@ -0,0 +1,63 @@
+package VanquishP2.Application.Beans.Filters;
+
+import VanquishP2.Application.Beans.Service.JWTUtil;
+import VanquishP2.DTOs.PrincipalDTO;
+import VanquishP2.Exceptions.AuthenticationException;
+import io.jsonwebtoken.Claims;
+import org.springframework.context.ApplicationContext;
+import org.springframework.stereotype.Component;
+import org.springframework.web.context.support.WebApplicationContextUtils;
+
+import javax.servlet.*;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+/**
+ * Authentication Filter
+ * Chains with other filters on every endpoint call to make sure the current request is from a valid source
+ * @author Kollier Martin
+ * @date 11/8/2021
+ */
+
+@Component
+public class AuthenticationFilter implements Filter {
+    private JWTUtil jwtUtil;
+
+    @Override
+    public void init(FilterConfig config) {
+        ApplicationContext container = WebApplicationContextUtils.getRequiredWebApplicationContext(config.getServletContext());
+        this.jwtUtil = container.getBean(JWTUtil.class);
+    }
+
+    @Override
+    public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain) throws ServletException, IOException {
+        HttpServletRequest request = (HttpServletRequest) req;
+        HttpServletResponse response = (HttpServletResponse) resp;
+
+        if (!request.getRequestURI().equals("/4TheMusic/login")
+                && !request.getRequestURI().equals("/4TheMusic/register/basic")
+                && !request.getRequestURI().equals("/4TheMusic/register/premium")
+                && !request.getRequestURI().equals("/4TheMusic/user/all")) {
+            parseToken(request);
+        }
+
+        chain.doFilter(request, response);
+    }
+
+    private void parseToken(HttpServletRequest request) throws AuthenticationException {
+        String errMessage = "Unauthorized user tried to barge their way in here! Don't worry, I caught this transgression. Error: %s";
+
+        String header = request.getHeader(jwtUtil.getHeader());
+
+        if (header == null || !header.startsWith(jwtUtil.getPrefix())) {
+            throw new AuthenticationException(errMessage);
+        } else {
+            String token = header.replaceAll(jwtUtil.getPrefix(), "");
+
+            Claims jwtClaims = jwtUtil.parseJWT(token);
+            PrincipalDTO principalDTO = new PrincipalDTO(jwtClaims);
+            request.setAttribute("principal", principalDTO);
+        }
+    }
+}

src/main/java/VanquishP2/Application/Beans/Filters/CORSFilter.java

@@ -0,0 +1,22 @@
+package VanquishP2.Application.Beans.Filters;
+
+import org.springframework.stereotype.Component;
+import org.springframework.web.filter.OncePerRequestFilter;
+
+import javax.servlet.FilterChain;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
+
+@Component
+public class CORSFilter extends OncePerRequestFilter {
+
+    @Override
+    protected void doFilterInternal(HttpServletRequest req, HttpServletResponse resp, FilterChain chain) throws ServletException, IOException {
+        resp.setHeader("Access-Control-Allow-Origin", "*");
+        resp.setHeader("Access-Control-Allow-Methods", "POST, GET, OPTIONS, DELETE, PUT, PATCH");
+        resp.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization, Authentication");
+        chain.doFilter(req, resp);
+    }
+}