Merge remote-tracking branch 'origin/master'

Author: SergeyPirogov

src/main/java/com/example/timecoder/gateway/controller/TimecoderController.java

@@ -77,6 +77,11 @@ public Object linkThemes(@PathVariable("id") Long id, @RequestBody List<Long> th
         return timecoderServiceProxy.linkThemes(id, themeList);
     }
 
+    @RequestMapping(value = "/episodes/{id}/theme/{themeId}/unlink", method = RequestMethod.POST)
+    public Object unlinkThemes(@PathVariable("id") Long id, @PathVariable("themeId") Long themeId) {
+        return timecoderServiceProxy.unlinkThemes(id, themeId);
+    }
+
     @RequestMapping(value = "/episodes/{id}/remove", method = RequestMethod.DELETE)
     public Object deleteEpisode(@PathVariable("id") Long id) {
         return timecoderServiceProxy.deleteEpisode(id);

src/main/java/com/example/timecoder/gateway/model/ThemeDto.java

@@ -0,0 +1,61 @@
+package com.example.timecoder.gateway.model;
+
+import java.time.Instant;
+import java.util.Date;
+
+public class ThemeDto {
+    private Long id;
+    private String title;
+    private String timecode;
+    private boolean passed = false;
+    private Instant timestamp = Instant.now();
+    private Date createdAt = new Date();
+
+    public Long getId() {
+        return id;
+    }
+
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public String getTimecode() {
+        return timecode;
+    }
+
+    public void setTimecode(String timecode) {
+        this.timecode = timecode;
+    }
+
+    public boolean isPassed() {
+        return passed;
+    }
+
+    public void setPassed(boolean passed) {
+        this.passed = passed;
+    }
+
+    public Instant getTimestamp() {
+        return timestamp;
+    }
+
+    public void setTimestamp(Instant timestamp) {
+        this.timestamp = timestamp;
+    }
+
+    public Date getCreatedAt() {
+        return createdAt;
+    }
+
+    public void setCreatedAt(Date createdAt) {
+        this.createdAt = createdAt;
+    }
+}

src/main/java/com/example/timecoder/gateway/proxy/TimecoderServiceProxy.java

@@ -4,6 +4,7 @@
 import com.example.timecoder.gateway.payload.timecoder.EpisodePayload;
 import com.example.timecoder.gateway.payload.timecoder.ThemePayload;
 import org.springframework.cloud.openfeign.FeignClient;
+import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -43,6 +44,9 @@ public interface TimecoderServiceProxy {
     @RequestMapping(value = "/episodes/{id}", method = RequestMethod.POST)
     Object linkThemes(@RequestParam Long id, List<Long> themeList);
 
+    @RequestMapping(value = "/episodes/{id}/theme/{themeId}/unlink", method = RequestMethod.POST)
+    Object unlinkThemes(@RequestParam Long id, @RequestParam Long themeId);
+
     @RequestMapping(value = "/episodes/{id}/remove", method = RequestMethod.DELETE)
     Object deleteEpisode(@RequestParam Long id);