refactor: delete bytes from vide

#2137

Author: jo-elimu

src/main/java/ai/elimu/entity/content/multimedia/Video.java

@@ -26,11 +26,6 @@ public class Video extends Multimedia {
   @NotNull
   private Integer fileSize;
 
-  @NotNull
-  @Lob
-  @Column(length = 209715200) // 200MB
-  private byte[] bytes;
-
   /**
    * MD5 checksum of the file content.
    */
@@ -44,6 +39,7 @@ public class Video extends Multimedia {
   @NotNull
   private String checksumGitHub;
 
+  @Deprecated
   @NotNull
   @Lob
   @Column(length = 1048576) // 1MB

src/main/java/ai/elimu/rest/v2/JpaToGsonConverter.java

@@ -354,7 +354,7 @@ public static VideoGson getVideoGson(Video video) {
             videoGson.setVideoFormat(video.getVideoFormat());
             videoGson.setChecksumMd5(video.getChecksumMd5());
             videoGson.setFileUrl(video.getUrl());
-            videoGson.setFileSize(video.getBytes().length / 1024);
+            videoGson.setFileSize(video.getFileSize());
             videoGson.setThumbnailUrl("/video/" + video.getId() + "_r" + video.getRevisionNumber() + "_thumbnail.png");
             Set<WordGson> wordGsons = new HashSet<>();
             for (Word word : video.getWords()) {

src/main/java/ai/elimu/web/content/multimedia/video/VideoCreateController.java

@@ -91,7 +91,6 @@ public String handleSubmit(
           video.setContentType(contentType);
 
           video.setFileSize(bytes.length);
-          video.setBytes(bytes);
           video.setChecksumMd5(ChecksumHelper.calculateMD5(bytes));
 
           // TODO: convert to a default video format?

src/main/java/ai/elimu/web/content/multimedia/video/VideoCsvExportController.java

@@ -12,7 +12,6 @@
 import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 
-
 @Controller
 @RequestMapping("/content/video/list/videos.csv")
 @RequiredArgsConstructor
@@ -28,7 +27,7 @@ public void handleRequest(
     log.info("handleRequest");
 
     // Generate CSV file
-    String csvFileContent = "id,content_type,content_license,attribution_url,title,checksum_md5,file_url,video_format" + "\n";
+    String csvFileContent = "id,content_type,content_license,attribution_url,title,checksum_md5,file_url,file_size,video_format" + "\n";
     List<Video> videos = videoDao.readAllOrderedById();
     log.info("videos.size(): " + videos.size());
     for (Video video : videos) {
@@ -39,6 +38,7 @@ public void handleRequest(
           + "\"" + video.getTitle() + "\","
           + "\"" + video.getChecksumMd5() + "\","
           + "\"" + video.getUrl() + "\","
+          + "\"" + video.getFileSize() + "\","
           + video.getVideoFormat() + "\n";
     }
 

src/main/java/ai/elimu/web/content/multimedia/video/VideoEditController.java

@@ -65,14 +65,6 @@ public String handleRequest(
     log.info("handleRequest");
 
     Video video = videoDao.read(id);
-    if (StringUtils.isBlank(video.getChecksumGitHub())) {
-      String checksumGitHub = GitHubLfsHelper.uploadVideoToLfs(video, video.getBytes());
-      video.setChecksumGitHub(checksumGitHub);
-      video.setRevisionNumber(video.getRevisionNumber() + 1);
-      videoDao.update(video);
-
-      // TODO: https://github.com/elimu-ai/webapp/issues/1545
-    }
     model.addAttribute("video", video);
 
     model.addAttribute("contentLicenses", ContentLicense.values());
@@ -127,7 +119,6 @@ public String handleSubmit(
           video.setContentType(contentType);
 
           video.setFileSize(bytes.length);
-          video.setBytes(bytes);
           video.setChecksumMd5(ChecksumHelper.calculateMD5(bytes));
 
           // TODO: convert to a default video format?

src/main/java/ai/elimu/web/download/VideoController.java

@@ -22,48 +22,6 @@ public class VideoController {
 
   private final VideoDao videoDao;
 
-  @GetMapping(value="/{videoId}_r{revisionNumber}.{videoFormat}")
-  public void handleRequest(
-      Model model,
-      @PathVariable Long videoId,
-      @PathVariable Integer revisionNumber,
-      @PathVariable String videoFormat,
-      HttpServletResponse response,
-      OutputStream outputStream) {
-    log.info("handleRequest");
-
-    log.info("videoId: " + videoId);
-    log.info("revisionNumber: " + revisionNumber);
-    log.info("videoFormat: " + videoFormat);
-
-    Video video = videoDao.read(videoId);
-
-    response.setContentType(video.getContentType());
-
-    byte[] bytes = video.getBytes();
-    response.setContentLength(bytes.length);
-    try {
-      outputStream.write(bytes);
-    } catch (EOFException ex) {
-      // org.eclipse.jetty.io.EofException (occurs when download is aborted before completion)
-      log.warn(ex.getMessage());
-    } catch (IOException ex) {
-      log.error(ex.getMessage());
-    } finally {
-      try {
-        try {
-          outputStream.flush();
-          outputStream.close();
-        } catch (EOFException ex) {
-          // org.eclipse.jetty.io.EofException (occurs when download is aborted before completion)
-          log.warn(ex.getMessage());
-        }
-      } catch (IOException ex) {
-        log.error(ex.getMessage());
-      }
-    }
-  }
-
   @GetMapping(value = "/{videoId}_r{revisionNumber}_thumbnail.png")
   public void handleThumbnailRequest(
       Model model,

src/main/java/ai/elimu/web/servlet/CustomDispatcherServlet.java

@@ -274,6 +274,7 @@ private void populateDatabase(WebApplicationContext webApplicationContext) {
             video.setFileSize(bytes.length);
             video.setChecksumMd5(ChecksumHelper.calculateMD5(bytes));
             video.setChecksumGitHub("1331d7c476649f4449ec7c6663fc107ce2b4d88b");
+            video.setThumbnail(Files.readAllBytes(new ClassRelativeResourceLoader(this.getClass()).getResource("placeholder.png").getFile().toPath()));
         } catch (IOException e) {
             logger.error(null, e);
         }

src/main/resources/META-INF/jpa-schema-export.sql

@@ -507,7 +507,6 @@
         attributionUrl text,
         contentLicense varchar(255),
         contentType varchar(255),
-        bytes longblob,
         checksumGitHub varchar(255),
         checksumMd5 varchar(255),
         fileSize integer,

src/main/resources/db/migration/2005109.sql

@@ -0,0 +1,3 @@
+# 2.5.109
+
+ALTER TABLE `Video` DROP COLUMN `bytes`;

src/main/webapp/WEB-INF/jsp/content/multimedia/video/create.jsp

@@ -81,7 +81,7 @@
                 <div class="file-field input-field col s12">
                     <div class="btn">
                         <span>File (M4V/MP4)</span>
-                        <form:input path="bytes" type="file" />
+                        <input name="bytes" type="file" />
                     </div>
                     <div class="file-path-wrapper">
                         <input class="file-path validate" type="text" />