From fec272b3c522f700f6465d3715640b17fe2518a9 Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Thu, 22 Oct 2020 10:15:17 +0300
Subject: [PATCH 1/7] Added failing test

---
 pom.xml                                       |  8 +++++
 .../code/restapi/api/VideoApiController.java  | 30 ++++++++++-------
 .../code/restapi/constant/ErrorMessage.java   |  9 ++++++
 .../code/restapi/constant/InfoMessage.java    | 13 ++++++++
 .../api/VideoApiControllerUnitTest.java       | 32 +++++++++++++++++++
 5 files changed, 80 insertions(+), 12 deletions(-)
 create mode 100644 src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java
 create mode 100644 src/main/java/com/birichani/code/restapi/constant/InfoMessage.java
 create mode 100644 src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java

diff --git a/pom.xml b/pom.xml
index 807f047..40d2d0f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,10 +19,12 @@
 	</properties>
 
 	<dependencies>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-data-jpa</artifactId>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-web</artifactId>
@@ -34,21 +36,25 @@
 			<scope>runtime</scope>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>com.h2database</groupId>
 			<artifactId>h2</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>mysql</groupId>
 			<artifactId>mysql-connector-java</artifactId>
 			<scope>runtime</scope>
 		</dependency>
+
 		<dependency>
 			<groupId>org.projectlombok</groupId>
 			<artifactId>lombok</artifactId>
 			<optional>true</optional>
 		</dependency>
+
 		<dependency>
 			<groupId>org.springframework.boot</groupId>
 			<artifactId>spring-boot-starter-test</artifactId>
@@ -60,12 +66,14 @@
 				</exclusion>
 			</exclusions>
 		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/com.github.javafaker/javafaker -->
 		<dependency>
 			<groupId>com.github.javafaker</groupId>
 			<artifactId>javafaker</artifactId>
 			<version>1.0.2</version>
 		</dependency>
+
 	</dependencies>
 
 	<build>
diff --git a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
index 9739c7d..ad9a72c 100644
--- a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
+++ b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
@@ -1,39 +1,45 @@
 package com.birichani.code.restapi.api;
 
+import com.birichani.code.restapi.constant.ErrorMessage;
+import com.birichani.code.restapi.constant.InfoMessage;
 import com.birichani.code.restapi.model.Video;
 import com.birichani.code.restapi.repository.VideoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
 import java.util.List;
 
+@RequestMapping("/videos")
 @RestController
 public class VideoApiController {
-	private VideoRepository videoRepository;
+	private final VideoRepository videoRepository;
 	
 	@Autowired
 	 public VideoApiController(VideoRepository videoRepository) {
 		this.videoRepository = videoRepository;
 	}
 	
-	@GetMapping("/Getvideos/{videoTopic}")
+	@GetMapping("/{videoTopic}")
 	public String video(@PathVariable String videoTopic) {
+		String message;
 		
-		switch(videoTopic) {
-		case"python":
-		
-		return String.format("This is our python contents") ;
-		case "java": 
-			return String.format("This is our java contents") ;
+		switch (videoTopic) {
+			case "python":
+				message = InfoMessage.PYTHON_RESPONSE_MESSAGE;
+				break;
+			case "java":
+				message = InfoMessage.JAVA_RESPONSE_MESSAGE;
+				break;
 			default:
-				return String.format("sorry,Incorrect input") ;
-			
-	}
+				message = ErrorMessage.VIDEO_TOPIC_SELECTION_MESSAGE;
+		}
 		
+		return message;
 }
-	@GetMapping("/GetAll")
+	@GetMapping()
 	public List<Video> getAllvideos(){
 		return videoRepository.findAll();
 	}
diff --git a/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java b/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java
new file mode 100644
index 0000000..ad823c7
--- /dev/null
+++ b/src/main/java/com/birichani/code/restapi/constant/ErrorMessage.java
@@ -0,0 +1,9 @@
+package com.birichani.code.restapi.constant;
+
+/**
+ * @author - JoeSeff
+ * @created - 22/10/2020 10:07
+ */
+public class ErrorMessage {
+    public static final String VIDEO_TOPIC_SELECTION_MESSAGE = "Sorry. Incorrect input.";
+}
diff --git a/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java b/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java
new file mode 100644
index 0000000..63e0dd3
--- /dev/null
+++ b/src/main/java/com/birichani/code/restapi/constant/InfoMessage.java
@@ -0,0 +1,13 @@
+package com.birichani.code.restapi.constant;
+
+import lombok.NoArgsConstructor;
+
+/**
+ * @author - JoeSeff
+ * @created - 22/10/2020 10:05
+ */
+@NoArgsConstructor
+public class InfoMessage {
+    public static final String PYTHON_RESPONSE_MESSAGE = "This is our python content.";
+    public static final String JAVA_RESPONSE_MESSAGE = "This is our java content.";
+}
diff --git a/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java b/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java
new file mode 100644
index 0000000..e098c51
--- /dev/null
+++ b/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java
@@ -0,0 +1,32 @@
+package com.birichani.code.restapi.api;
+
+import com.birichani.code.restapi.constant.InfoMessage;
+import com.birichani.code.restapi.repository.VideoRepository;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.Spy;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+/**
+ * @author - JoeSeff
+ * @created - 22/10/2020 09:57
+ */
+
+@DisplayName("Video API Controller Unit Test")
+class VideoApiControllerUnitTest {
+    
+    @Mock
+    VideoRepository videoRepository;
+    VideoApiController controller = new VideoApiController(videoRepository);
+    
+    @Test
+    @DisplayName("Test That Correct Video Topic Is Returned")
+    void testThatCorrectVideoTopicIsReturned() {
+        String response = controller.video("Java");
+        assertEquals(InfoMessage.JAVA_RESPONSE_MESSAGE, response);
+    }
+
+}
\ No newline at end of file

From 3bc06a8e238073ec622ad38adaade739d13fb47e Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Thu, 22 Oct 2020 23:52:58 +0300
Subject: [PATCH 2/7] Fixed failing test

---
 .../java/com/birichani/code/restapi/api/VideoApiController.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
index ad9a72c..dc33bfc 100644
--- a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
+++ b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
@@ -26,7 +26,7 @@ public VideoApiController(VideoRepository videoRepository) {
 	public String video(@PathVariable String videoTopic) {
 		String message;
 		
-		switch (videoTopic) {
+		switch (videoTopic.toLowerCase()) {
 			case "python":
 				message = InfoMessage.PYTHON_RESPONSE_MESSAGE;
 				break;

From e3fd2e093a2eca961baa0c18bfe9a61be45cf68d Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Fri, 23 Oct 2020 00:13:20 +0300
Subject: [PATCH 3/7] Moving business logic to service layer

Renamed method name to make it more intuitive
---
 pom.xml                                       | 12 +++++++
 .../code/restapi/api/VideoApiController.java  | 28 +++++-----------
 .../code/restapi/service/VideoService.java    | 33 +++++++++++++++++++
 .../api/VideoApiControllerUnitTest.java       | 32 ------------------
 .../restapi/service/VideoServiceTest.java     | 23 +++++++++++++
 5 files changed, 76 insertions(+), 52 deletions(-)
 create mode 100644 src/main/java/com/birichani/code/restapi/service/VideoService.java
 delete mode 100644 src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java
 create mode 100644 src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java

diff --git a/pom.xml b/pom.xml
index 40d2d0f..2881715 100644
--- a/pom.xml
+++ b/pom.xml
@@ -64,9 +64,21 @@
 					<groupId>org.junit.vintage</groupId>
 					<artifactId>junit-vintage-engine</artifactId>
 				</exclusion>
+				<exclusion>
+					<groupId>org.mockito</groupId>
+					<artifactId>mockito-core</artifactId>
+				</exclusion>
 			</exclusions>
 		</dependency>
 
+		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter -->
+		<dependency>
+			<groupId>org.mockito</groupId>
+			<artifactId>mockito-junit-jupiter</artifactId>
+			<version>3.5.15</version>
+			<scope>test</scope>
+		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/com.github.javafaker/javafaker -->
 		<dependency>
 			<groupId>com.github.javafaker</groupId>
diff --git a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
index dc33bfc..e8e76ee 100644
--- a/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
+++ b/src/main/java/com/birichani/code/restapi/api/VideoApiController.java
@@ -1,7 +1,5 @@
 package com.birichani.code.restapi.api;
 
-import com.birichani.code.restapi.constant.ErrorMessage;
-import com.birichani.code.restapi.constant.InfoMessage;
 import com.birichani.code.restapi.model.Video;
 import com.birichani.code.restapi.repository.VideoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -9,6 +7,7 @@
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
+import com.birichani.code.restapi.service.VideoService;
 
 import java.util.List;
 
@@ -16,31 +15,20 @@
 @RestController
 public class VideoApiController {
 	private final VideoRepository videoRepository;
+	private final VideoService videoService;
 	
 	@Autowired
-	 public VideoApiController(VideoRepository videoRepository) {
+	 public VideoApiController(VideoRepository videoRepository, VideoService videoService) {
 		this.videoRepository = videoRepository;
+		this.videoService = videoService;
 	}
 	
 	@GetMapping("/{videoTopic}")
-	public String video(@PathVariable String videoTopic) {
-		String message;
-		
-		switch (videoTopic.toLowerCase()) {
-			case "python":
-				message = InfoMessage.PYTHON_RESPONSE_MESSAGE;
-				break;
-			case "java":
-				message = InfoMessage.JAVA_RESPONSE_MESSAGE;
-				break;
-			default:
-				message = ErrorMessage.VIDEO_TOPIC_SELECTION_MESSAGE;
-		}
-		
-		return message;
-}
+	public String getVideosByTopic(@PathVariable String videoTopic) {
+		return videoService.getVideosByTopic(videoTopic);
+	}
 	@GetMapping()
-	public List<Video> getAllvideos(){
+	public List<Video> getAllVideos(){
 		return videoRepository.findAll();
 	}
 }
diff --git a/src/main/java/com/birichani/code/restapi/service/VideoService.java b/src/main/java/com/birichani/code/restapi/service/VideoService.java
new file mode 100644
index 0000000..edb09b4
--- /dev/null
+++ b/src/main/java/com/birichani/code/restapi/service/VideoService.java
@@ -0,0 +1,33 @@
+package com.birichani.code.restapi.service;
+
+import com.birichani.code.restapi.constant.ErrorMessage;
+import com.birichani.code.restapi.constant.InfoMessage;
+import com.birichani.code.restapi.repository.VideoRepository;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+/**
+ * @author - JoeSeff
+ * @created - 22/10/2020 23:57
+ */
+
+@Service
+public class VideoService {
+    
+    public String getVideosByTopic(String videoTopic) {
+        String message;
+    
+        switch (videoTopic.toLowerCase()) {
+            case "python":
+                message = InfoMessage.PYTHON_RESPONSE_MESSAGE;
+                break;
+            case "java":
+                message = InfoMessage.JAVA_RESPONSE_MESSAGE;
+                break;
+            default:
+                message = ErrorMessage.VIDEO_TOPIC_SELECTION_MESSAGE;
+        }
+    
+        return message;
+    }
+}
diff --git a/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java b/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java
deleted file mode 100644
index e098c51..0000000
--- a/src/test/java/com/birichani/code/restapi/api/VideoApiControllerUnitTest.java
+++ /dev/null
@@ -1,32 +0,0 @@
-package com.birichani.code.restapi.api;
-
-import com.birichani.code.restapi.constant.InfoMessage;
-import com.birichani.code.restapi.repository.VideoRepository;
-import org.junit.jupiter.api.DisplayName;
-import org.junit.jupiter.api.Test;
-import org.mockito.InjectMocks;
-import org.mockito.Mock;
-import org.mockito.Spy;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-/**
- * @author - JoeSeff
- * @created - 22/10/2020 09:57
- */
-
-@DisplayName("Video API Controller Unit Test")
-class VideoApiControllerUnitTest {
-    
-    @Mock
-    VideoRepository videoRepository;
-    VideoApiController controller = new VideoApiController(videoRepository);
-    
-    @Test
-    @DisplayName("Test That Correct Video Topic Is Returned")
-    void testThatCorrectVideoTopicIsReturned() {
-        String response = controller.video("Java");
-        assertEquals(InfoMessage.JAVA_RESPONSE_MESSAGE, response);
-    }
-
-}
\ No newline at end of file
diff --git a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
new file mode 100644
index 0000000..2637355
--- /dev/null
+++ b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
@@ -0,0 +1,23 @@
+package com.birichani.code.restapi.service;
+
+import com.birichani.code.restapi.constant.InfoMessage;
+import org.junit.jupiter.api.DisplayName;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+/**
+ * @author - JoeSeff
+ * @created - 23/10/2020 00:08
+ */
+class VideoServiceTest {
+    private final VideoService videoService = new VideoService();
+    
+    @Test
+    @DisplayName("Test That Correct Video Topic Is Returned")
+    void testThatCorrectVideoTopicIsReturned() {
+        String response = videoService.getVideosByTopic("Java");
+        assertEquals(InfoMessage.JAVA_RESPONSE_MESSAGE, response);
+    }
+    
+}
\ No newline at end of file

From c42a826639c119a58e37d1c9a1ec01c9b3658bb7 Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Fri, 23 Oct 2020 01:15:42 +0300
Subject: [PATCH 4/7] Adding filter test

---
 pom.xml                                       | 25 +++++++
 .../birichani/code/restapi/model/Video.java   |  6 +-
 .../code/restapi/service/VideoService.java    | 17 +++++
 .../repository/VideoRepositoryTest.java       |  2 +-
 .../restapi/service/VideoServiceTest.java     | 65 ++++++++++++++++++-
 5 files changed, 112 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 2881715..9363ceb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -16,6 +16,7 @@
 
 	<properties>
 		<java.version>1.8</java.version>
+		<junit-jupiter.version>5.7.0</junit-jupiter.version>
 	</properties>
 
 	<dependencies>
@@ -60,6 +61,18 @@
 			<artifactId>spring-boot-starter-test</artifactId>
 			<scope>test</scope>
 			<exclusions>
+				<exclusion>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-api</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-params</artifactId>
+				</exclusion>
+				<exclusion>
+					<groupId>org.junit.jupiter</groupId>
+					<artifactId>junit-jupiter-engine</artifactId>
+				</exclusion>
 				<exclusion>
 					<groupId>org.junit.vintage</groupId>
 					<artifactId>junit-vintage-engine</artifactId>
@@ -71,6 +84,18 @@
 			</exclusions>
 		</dependency>
 
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-api</artifactId>
+			<version>${junit-jupiter.version}</version>
+		</dependency>
+
+		<dependency>
+			<groupId>org.junit.jupiter</groupId>
+			<artifactId>junit-jupiter-engine</artifactId>
+			<version>${junit-jupiter.version}</version>
+		</dependency>
+
 		<!-- https://mvnrepository.com/artifact/org.mockito/mockito-junit-jupiter -->
 		<dependency>
 			<groupId>org.mockito</groupId>
diff --git a/src/main/java/com/birichani/code/restapi/model/Video.java b/src/main/java/com/birichani/code/restapi/model/Video.java
index 3076688..14882c9 100644
--- a/src/main/java/com/birichani/code/restapi/model/Video.java
+++ b/src/main/java/com/birichani/code/restapi/model/Video.java
@@ -1,5 +1,6 @@
 package com.birichani.code.restapi.model;
 
+import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
@@ -10,6 +11,7 @@
 
 @Data
 @NoArgsConstructor
+@AllArgsConstructor
 @Entity
 public class Video {
 	@Id
@@ -17,9 +19,11 @@ public class Video {
 	private Long vid;
 	private String title;
 	private String description;
+	private String topic;
 	
-	public Video(String title, String description) {
+	public Video(String title, String description, String topic) {
 		this.title = title;
 		this.description = description;
+		this.topic = topic;
 	}
 }
diff --git a/src/main/java/com/birichani/code/restapi/service/VideoService.java b/src/main/java/com/birichani/code/restapi/service/VideoService.java
index edb09b4..c2d4116 100644
--- a/src/main/java/com/birichani/code/restapi/service/VideoService.java
+++ b/src/main/java/com/birichani/code/restapi/service/VideoService.java
@@ -2,10 +2,16 @@
 
 import com.birichani.code.restapi.constant.ErrorMessage;
 import com.birichani.code.restapi.constant.InfoMessage;
+import com.birichani.code.restapi.model.Video;
 import com.birichani.code.restapi.repository.VideoRepository;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.Collections;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
 /**
  * @author - JoeSeff
  * @created - 22/10/2020 23:57
@@ -13,6 +19,12 @@
 
 @Service
 public class VideoService {
+    private final VideoRepository videoRepository;
+    
+    @Autowired
+    public VideoService(VideoRepository videoRepository) {
+        this.videoRepository = videoRepository;
+    }
     
     public String getVideosByTopic(String videoTopic) {
         String message;
@@ -30,4 +42,9 @@ public String getVideosByTopic(String videoTopic) {
     
         return message;
     }
+    
+    // TODO: Correct me
+    public List<Video> filterVideosByTopic(String title) {
+        return Collections.emptyList();
+    }
 }
diff --git a/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java b/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java
index b2af782..322292a 100644
--- a/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java
+++ b/src/test/java/com/birichani/code/restapi/repository/VideoRepositoryTest.java
@@ -36,7 +36,7 @@ void testThatRecordsAreInserted() {
         assertNotNull(videoRepository);
     
         for (int i = 0; i < 5; i++) {
-            videoRepository.save( new Video(faker.name().title(), faker.lorem().paragraph()) );
+            videoRepository.save( new Video(faker.name().title(), faker.lorem().paragraph(), faker.company().industry()) );
         }
         
         assertEquals(5, videoRepository.count());
diff --git a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
index 2637355..2f35e8a 100644
--- a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
+++ b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
@@ -1,17 +1,67 @@
 package com.birichani.code.restapi.service;
 
 import com.birichani.code.restapi.constant.InfoMessage;
+import com.birichani.code.restapi.model.Video;
+import com.birichani.code.restapi.repository.VideoRepository;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.ExtendWith;
+import org.mockito.InjectMocks;
+import org.mockito.Mock;
+import org.mockito.junit.jupiter.MockitoExtension;
+
+import java.util.Arrays;
+import java.util.List;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
+import static org.junit.jupiter.api.Assertions.*;
+import static org.assertj.core.api.BDDAssertions.*;
+import static org.mockito.BDDMockito.*;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.Mockito.mock;
+
 /**
  * @author - JoeSeff
  * @created - 23/10/2020 00:08
  */
+@ExtendWith(MockitoExtension.class)
 class VideoServiceTest {
-    private final VideoService videoService = new VideoService();
+    
+    @Mock
+    private VideoRepository videoRepository;
+    
+    @InjectMocks
+    private VideoService videoService;
+    
+    List<Video> videoList;
+    Video goneIn60Seconds, transporter, whiteHouseDown, loveAtFirstHiccup;
+    Video blended, pyaarImpossible, iAmInLoveWithAChurchGirl, saw, houseOfWax;
+    Video exorcismOfEmilyRose, mrBones, funWithDickAndJane, weAreTheMillers, threeIdiots;
+    
+    @BeforeEach
+    void setup() {
+        goneIn60Seconds = new Video(1L, "Gone in 60 Seconds", "None", "Thriller");
+        transporter = new Video(2L, "Transporter", "None", "Action");
+        whiteHouseDown = new Video(3L, "White House Down", "None", "Action");
+        loveAtFirstHiccup = new Video(4L, "Love at First Hiccup", "None", "Romance Comedy");
+        blended = new Video(5L, "Blended", "None", "Romance Comedy");
+        pyaarImpossible = new Video(6L, "Pyaar Impossible", "None", "Romance");
+        iAmInLoveWithAChurchGirl = new Video(7L, "I am In Love with A Church Girl", "None", "Romance");
+        saw = new Video(8L, "SAW", "None", "Horror");
+        houseOfWax = new Video(9L, "House of Wax", "None", "Horror");
+        exorcismOfEmilyRose = new Video(10L, "The Exorcism of Emily Rose", "None", "Horror");
+        mrBones = new Video(11L, "Mr Bones", "None", "Comedy");
+        funWithDickAndJane = new Video(12L, "Mr Bones", "None", "Comedy");
+        weAreTheMillers = new Video(13L, "We Are The Millers", "None", "Comedy");
+        threeIdiots = new Video(14L, "3 Idiots", "None", "Comedy");
+    
+        videoList = Arrays.asList(goneIn60Seconds, transporter, whiteHouseDown, loveAtFirstHiccup,
+                blended, pyaarImpossible, iAmInLoveWithAChurchGirl, saw, houseOfWax, exorcismOfEmilyRose, mrBones,
+                funWithDickAndJane, weAreTheMillers, threeIdiots);
+    }
     
     @Test
     @DisplayName("Test That Correct Video Topic Is Returned")
@@ -20,4 +70,17 @@ void testThatCorrectVideoTopicIsReturned() {
         assertEquals(InfoMessage.JAVA_RESPONSE_MESSAGE, response);
     }
     
+    @Test
+    @DisplayName("Filter videos based on topic attribute")
+    void shouldFilterVideosByTitle() {
+        // when
+        when(videoRepository.findAll()).thenReturn(videoList);
+        
+        // then
+        List<Video> filteredVideoList = videoService.filterVideosByTopic("Horror");
+        assertThat(filteredVideoList).containsExactlyInAnyOrder(saw, houseOfWax, exorcismOfEmilyRose);
+    }
+    
+    
+    
 }
\ No newline at end of file

From f60a0d26463e3969a3225547a250269d9b5e4bed Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Tue, 27 Oct 2020 20:14:54 +0300
Subject: [PATCH 5/7] Filtering by Video Topic implemented

---
 .../birichani/code/restapi/service/VideoService.java  | 11 +++++++++--
 .../code/restapi/service/VideoServiceTest.java        | 11 +++--------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/src/main/java/com/birichani/code/restapi/service/VideoService.java b/src/main/java/com/birichani/code/restapi/service/VideoService.java
index c2d4116..d29ab61 100644
--- a/src/main/java/com/birichani/code/restapi/service/VideoService.java
+++ b/src/main/java/com/birichani/code/restapi/service/VideoService.java
@@ -7,6 +7,7 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -44,7 +45,13 @@ public String getVideosByTopic(String videoTopic) {
     }
     
     // TODO: Correct me
-    public List<Video> filterVideosByTopic(String title) {
-        return Collections.emptyList();
+    public List<Video> filterVideosByTopic(String topic) {
+        List<Video> videoList = videoRepository.findAll();
+        
+        return videoList.stream()
+                .filter(Objects::nonNull)
+                .filter(video -> video.getTopic() != null)
+                .filter(video -> video.getTopic().equalsIgnoreCase(topic))
+                .collect(Collectors.toList());
     }
 }
diff --git a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
index 2f35e8a..a0a0f97 100644
--- a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
+++ b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
@@ -4,7 +4,6 @@
 import com.birichani.code.restapi.model.Video;
 import com.birichani.code.restapi.repository.VideoRepository;
 import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.DisplayName;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;
@@ -15,13 +14,9 @@
 import java.util.Arrays;
 import java.util.List;
 
+import static org.assertj.core.api.BDDAssertions.assertThat;
 import static org.junit.jupiter.api.Assertions.assertEquals;
-
-import static org.junit.jupiter.api.Assertions.*;
-import static org.assertj.core.api.BDDAssertions.*;
-import static org.mockito.BDDMockito.*;
-import static org.mockito.ArgumentMatchers.any;
-import static org.mockito.Mockito.mock;
+import static org.mockito.BDDMockito.when;
 
 /**
  * @author - JoeSeff
@@ -72,7 +67,7 @@ void testThatCorrectVideoTopicIsReturned() {
     
     @Test
     @DisplayName("Filter videos based on topic attribute")
-    void shouldFilterVideosByTitle() {
+    void shouldFilterVideosByTopic() {
         // when
         when(videoRepository.findAll()).thenReturn(videoList);
         

From df59f0d0631d204f9bd5e3a9d77053c9831eaa43 Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Tue, 27 Oct 2020 20:20:54 +0300
Subject: [PATCH 6/7] Added test to filter videos by title

---
 .../com/birichani/code/restapi/service/VideoService.java  | 7 ++++++-
 .../birichani/code/restapi/service/VideoServiceTest.java  | 8 ++++++++
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/birichani/code/restapi/service/VideoService.java b/src/main/java/com/birichani/code/restapi/service/VideoService.java
index d29ab61..51100ed 100644
--- a/src/main/java/com/birichani/code/restapi/service/VideoService.java
+++ b/src/main/java/com/birichani/code/restapi/service/VideoService.java
@@ -44,7 +44,6 @@ public String getVideosByTopic(String videoTopic) {
         return message;
     }
     
-    // TODO: Correct me
     public List<Video> filterVideosByTopic(String topic) {
         List<Video> videoList = videoRepository.findAll();
         
@@ -54,4 +53,10 @@ public List<Video> filterVideosByTopic(String topic) {
                 .filter(video -> video.getTopic().equalsIgnoreCase(topic))
                 .collect(Collectors.toList());
     }
+    
+    
+    // TODO: Implement me
+    public List<Video> filterVideosByTitle(String title) {
+        return Collections.emptyList();
+    }
 }
diff --git a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
index a0a0f97..fb18f2e 100644
--- a/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
+++ b/src/test/java/com/birichani/code/restapi/service/VideoServiceTest.java
@@ -76,6 +76,14 @@ void shouldFilterVideosByTopic() {
         assertThat(filteredVideoList).containsExactlyInAnyOrder(saw, houseOfWax, exorcismOfEmilyRose);
     }
     
+    @Test
+    @DisplayName("Filter videos based on title attribute")
+    void shouldFilterVideosByTitle() {
+        // when
+        when(videoRepository.findAll()).thenReturn(videoList);
     
+        List<Video> videoList = videoService.filterVideosByTitle("the");
+        assertThat(videoList).contains(exorcismOfEmilyRose);
+    }
     
 }
\ No newline at end of file

From fc8e04aa6755b0ad1f9d6672cea883dad7e2cd9c Mon Sep 17 00:00:00 2001
From: JoeSeff <maxwellandlynx@gmail.com>
Date: Thu, 29 Oct 2020 23:14:02 +0300
Subject: [PATCH 7/7] Test passing, filtering implemented by title

---
 .../com/birichani/code/restapi/service/VideoService.java | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/birichani/code/restapi/service/VideoService.java b/src/main/java/com/birichani/code/restapi/service/VideoService.java
index 51100ed..438196e 100644
--- a/src/main/java/com/birichani/code/restapi/service/VideoService.java
+++ b/src/main/java/com/birichani/code/restapi/service/VideoService.java
@@ -7,7 +7,6 @@
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 import java.util.Objects;
@@ -57,6 +56,12 @@ public List<Video> filterVideosByTopic(String topic) {
     
     // TODO: Implement me
     public List<Video> filterVideosByTitle(String title) {
-        return Collections.emptyList();
+        List<Video> videoList = videoRepository.findAll();
+        
+        return videoList.stream()
+                .filter(Objects::nonNull)
+                .filter(video -> video.getTitle() != null)
+                .filter(video -> video.getTitle().toLowerCase().contains(title.toLowerCase()))
+                .collect(Collectors.toList());
     }
 }