Erstellt-Datum an Entwurf? gekoppelt

Dockerfile

@@ -47,7 +47,7 @@ FROM base
 
 COPY docker/entrypoint.sh /bin/entrypoint.sh
 COPY docker/postgresql-42.7.1.jar $JBOSS_HOME/standalone/deployments/postgresql-driver.jar
-COPY --from=build-war /src/target/tilstory-0.0.6.war $JBOSS_HOME/standalone/deployments/tilstory.war
+COPY --from=build-war /src/target/tilstory-0.0.7.war $JBOSS_HOME/standalone/deployments/tilstory.war
 COPY docker/standalone.xml $JBOSS_HOME/standalone/configuration/standalone.xml
 COPY docker/application.keystore $JBOSS_HOME/standalone/configuration/application.keystore
 

README.md

@@ -10,5 +10,5 @@ Meine Blogsoftware. TIL = Today I learned.
 ## Das Image bauen
 
 ```bash
-docker build --network=host --force-rm -t ghcr.io/schipplock/tilstory:v0.0.6 .
+docker build --network=host --force-rm -t ghcr.io/schipplock/tilstory:v0.0.7 .
 ```

docker-compose.yml

@@ -65,7 +65,7 @@ services:
       - flywaydb
 
   tilstory-app:
-    image: ghcr.io/schipplock/tilstory:v0.0.6
+    image: ghcr.io/schipplock/tilstory:v0.0.7
     container_name: tilstory-app
     networks:
       local-net:

pom.xml

@@ -18,7 +18,7 @@ limitations under the License.
     <groupId>de.schipplock.web</groupId>
     <artifactId>tilstory</artifactId>
     <packaging>war</packaging>
-    <version>0.0.6</version>
+    <version>0.0.7</version>
     <name>TILstory</name>
     <description>Today I learned - blogging tool</description>
     <url>https://github.com/schipplock/tilstory</url>

sql-migrations/V3__drop-default-creationdate.sql

@@ -0,0 +1 @@
+ALTER TABLE public.posts ALTER COLUMN created DROP DEFAULT;

src/main/java/de/schipplock/web/tilstory/business/posts/control/PostManager.java

@@ -33,6 +33,11 @@ public Post createPost(String subject, String body, boolean isDraft, Collection<
         Post post = new Post(uuid, subject, body, isDraft);
         post.setFileUploads(handleFileUploads(post, fileParts));
         post.setFileUploads(deleteSelectedFilesForPost(post, fileNamesForDeletion));
+
+        if (!isDraft) {
+            post.setCreated(LocalDateTime.now());
+        }
+
         return em.merge(post);
     }
 
@@ -41,10 +46,17 @@ public Post updatePost(long postId, String subject, String body, boolean isDraft
         post.setSubject(subject);
         post.setBody(body);
         post.setDraft(isDraft);
-        post.setUpdated(LocalDateTime.now());
         post.setFileUploads(handleFileUploads(post, fileParts));
         post.setFileUploads(deleteSelectedFilesForPost(post, fileNamesForDeletion));
 
+        if (!isDraft) {
+            post.setUpdated(LocalDateTime.now());
+            if (post.getCreated() == null) {
+                post.setCreated(LocalDateTime.now());
+                post.setUpdated(null);
+            }
+        }
+
         return em.merge(post);
     }
 

src/main/java/de/schipplock/web/tilstory/business/posts/entity/Post.java

@@ -25,6 +25,8 @@ public class Post {
 
     private boolean draft;
 
+    private LocalDateTime created;
+
     private LocalDateTime updated;
 
     @OneToMany(cascade = CascadeType.ALL, mappedBy = "post", orphanRemoval = true)
@@ -87,6 +89,14 @@ public void setFileUploads(List<FileUpload> fileUploads) {
         this.fileUploads = fileUploads;
     }
 
+    public LocalDateTime getCreated() {
+        return created;
+    }
+
+    public void setCreated(LocalDateTime created) {
+        this.created = created;
+    }
+
     public LocalDateTime getUpdated() {
         return updated;
     }

src/main/webapp/WEB-INF/includes/admin/header.jsp

@@ -12,7 +12,7 @@
     <h1># <a href="${pageContext.request.contextPath}/">${settings:name()}</a></h1>
     <h2>Kurze Texte von ${settings:author()}</h2>
     <h3>
-        <a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.6</a> |
+        <a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.7</a> |
         <a href="${pageContext.request.contextPath}/rss.jsp">rss</a>
     </h3>
 </header>

src/main/webapp/WEB-INF/includes/header.jsp

@@ -17,7 +17,7 @@
     <h1># <a href="${pageContext.request.contextPath}/">${settings:name()}</a></h1>
     <h2>Kurze Texte von ${settings:author()}</h2>
     <h3>
-      <a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.6</a> |
+      <a href="https://github.com/schipplock/tilstory" target="_blank">TILStory 0.0.7</a> |
       <a href="${pageContext.request.contextPath}/rss.jsp">rss</a>
     </h3>
   </header>