From 6c8554a0b803b6d4845f1964b4594afbdf42685a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=A1=D0=B5=D0=BC=D0=B5=D0=BD=D0=BE=D0=B2=D0=B0=20=D0=9C?=
 =?UTF-8?q?=D0=B0=D1=80=D0=B8=D1=8F?= <semenovamasha98@mail.ru>
Date: Thu, 18 Apr 2019 23:37:08 +0400
Subject: [PATCH] #106 change boolean to nullable

---
 src/main/java/ru/ulstu/file/model/FileData.java      |  6 +++---
 src/main/java/ru/ulstu/file/model/FileDataDto.java   | 12 ++++++------
 src/main/java/ru/ulstu/file/service/FileService.java |  2 +-
 .../papers/fragments/paperFilesListFragment.html     |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/main/java/ru/ulstu/file/model/FileData.java b/src/main/java/ru/ulstu/file/model/FileData.java
index 08445a3..3f97130 100644
--- a/src/main/java/ru/ulstu/file/model/FileData.java
+++ b/src/main/java/ru/ulstu/file/model/FileData.java
@@ -20,7 +20,7 @@ public class FileData extends BaseEntity {
     private byte[] data;
 
     @Column(name = "is_latex_attach")
-    private boolean isLatexAttach;
+    private Boolean isLatexAttach;
 
     public String getName() {
         return name;
@@ -54,11 +54,11 @@ public class FileData extends BaseEntity {
         this.data = data;
     }
 
-    public boolean isLatexAttach() {
+    public Boolean isLatexAttach() {
         return isLatexAttach;
     }
 
-    public void setLatexAttach(boolean latexAttach) {
+    public void setLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 }
diff --git a/src/main/java/ru/ulstu/file/model/FileDataDto.java b/src/main/java/ru/ulstu/file/model/FileDataDto.java
index 65ef275..e83bf12 100644
--- a/src/main/java/ru/ulstu/file/model/FileDataDto.java
+++ b/src/main/java/ru/ulstu/file/model/FileDataDto.java
@@ -9,7 +9,7 @@ public class FileDataDto {
     private String fileName;
     private String tmpFileName;
     private boolean deleted;
-    private boolean isLatexAttach;
+    private Boolean isLatexAttach;
 
     public FileDataDto() {
     }
@@ -17,7 +17,7 @@ public class FileDataDto {
     @JsonCreator
     public FileDataDto(@JsonProperty("id") Integer id,
                        @JsonProperty("name") String name,
-                       @JsonProperty("isLatexAttach") boolean isLatexAttach,
+                       @JsonProperty("isLatexAttach") Boolean isLatexAttach,
                        @JsonProperty("fileName") String fileName,
                        @JsonProperty("tmpFileName") String tmpFileName) {
         this.id = id;
@@ -77,19 +77,19 @@ public class FileDataDto {
         this.deleted = deleted;
     }
 
-    public boolean isLatexAttach() {
+    public Boolean isLatexAttach() {
         return isLatexAttach;
     }
 
-    public boolean getIsLatexAttach() {
+    public Boolean getIsLatexAttach() {
         return isLatexAttach;
     }
 
-    public void setLatexAttach(boolean latexAttach) {
+    public void setLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 
-    public void setIsLatexAttach(boolean latexAttach) {
+    public void setIsLatexAttach(Boolean latexAttach) {
         isLatexAttach = latexAttach;
     }
 }
diff --git a/src/main/java/ru/ulstu/file/service/FileService.java b/src/main/java/ru/ulstu/file/service/FileService.java
index 3a0a87c..d3a7e8c 100644
--- a/src/main/java/ru/ulstu/file/service/FileService.java
+++ b/src/main/java/ru/ulstu/file/service/FileService.java
@@ -127,7 +127,7 @@ public class FileService {
     public void createLatexAttachs(PaperDto paper) throws IOException {
         for (FileDataDto fileDataDto : paper.getFiles()
                 .stream()
-                .filter(f -> f.isLatexAttach() && !f.isDeleted())
+                .filter(f -> (f.isLatexAttach()!=null && f.isLatexAttach()) && !f.isDeleted())
                 .collect(Collectors.toList())) {
             if (fileDataDto.getId() == null) {
                 File oldFile = getTmpFilePath(fileDataDto.getTmpFileName()).toFile();
diff --git a/src/main/resources/templates/papers/fragments/paperFilesListFragment.html b/src/main/resources/templates/papers/fragments/paperFilesListFragment.html
index fcc875c..5934c59 100644
--- a/src/main/resources/templates/papers/fragments/paperFilesListFragment.html
+++ b/src/main/resources/templates/papers/fragments/paperFilesListFragment.html
@@ -8,7 +8,7 @@
 <div th:fragment="filesList (isLatexAttach)" th:remove="tag">
     <th:block th:each="file, rowStat : *{files}">
 
-        <span th:if="${file.isLatexAttach == isLatexAttach}" th:remove="tag">
+        <span th:if="${(!isLatexAttach and file.isLatexAttach == null) or file.isLatexAttach == isLatexAttach}" th:remove="tag">
 
             <div class="row" th:id="|files${rowStat.index}|"
                  th:style="${file.deleted} ? 'display: none;' :''">