Merge branch 'hotfix/updated-date-change'

dan-zx · Mar 31, 2020 · 379eebd · 379eebd
2 parents 7fab15b + 76a8f3d
commit 379eebd
Show file tree

Hide file tree

Showing 6 changed files with 9 additions and 10 deletions.
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-# XOF API v1.2
+# XOF API v1.2.1
 
 [![Coverage](https://codecov.io/gh/dan-zx/xof-api/branch/master/graph/badge.svg)](https://codecov.io/gh/dan-zx/xof-api)
 [![Build Status](https://api.travis-ci.com/dan-zx/xof-api.svg?branch=master)](https://travis-ci.com/dan-zx/xof-api)

diff --git a/build.gradle b/build.gradle
@@ -25,7 +25,7 @@ subprojects {
     apply plugin: 'nl.fabianm.kotlin.plugin.generated'
 
     group 'com.github.danzx.xof'
-    version '1.2'
+    version '1.2.1'
     sourceCompatibility = JavaVersion.VERSION_11
 
     repositories {

diff --git a/xof-app/src/main/resources/application-heroku.properties b/xof-app/src/main/resources/application-heroku.properties
@@ -1,5 +1,5 @@
 # Logging
-logging.pattern.console=[%d{yyyy-MM-dd'T'HH:mm:ss}] %-5level in %logger - %msg%n
+logging.pattern.console=%highlight(%-5level) in %class{0} - %msg%n
 logging.level.liquibase.changelog.ChangeSet=INFO
 logging.level.com.github.danzx.xof=INFO
 

diff --git a/xof-app/src/main/resources/application.properties b/xof-app/src/main/resources/application.properties
@@ -1,4 +1,6 @@
 spring.main.banner-mode=off
+spring.jackson.default-property-inclusion=non_null
+spring.jpa.open-in-view=false
 
 # Logging
 logging.level.com.zaxxer.hikari=WARN
@@ -9,13 +11,10 @@ logging.level.org.hibernate=WARN
 logging.level.org.springframework=WARN
 logging.level.springfox=WARN
 
-# JPA
-spring.jpa.open-in-view=false
-
 # Liquibase
 spring.liquibase.enabled=false
 spring.liquibase.change-log=classpath:db/db-changelog.xml
 
 # Swagger
 swagger.title=XOF API
-swagger.version=1.2
+swagger.version=1.2.1
diff --git a/...ce/src/main/kotlin/com/github/danzx/xof/dataprovider/jpa/adapter/mapper/CommentMappers.kt b/...ce/src/main/kotlin/com/github/danzx/xof/dataprovider/jpa/adapter/mapper/CommentMappers.kt
@@ -10,7 +10,7 @@ fun Comment.toCommentJpaEntity(post: PostJpaEntity, user: UserJpaEntity, parentC
     id = id.orAutoGeneratedId(),
     content = content,
     created = created,
-    updated = created,
+    updated = updated,
     post = post,
     user = user,
     parentComment = parentComment
@@ -20,7 +20,7 @@ fun CommentJpaEntity.toComment(votes: Long) = Comment(
     id = id!!,
     content = content,
     created = created,
-    updated = created,
+    updated = updated,
     votes = votes,
     postId = post.id!!,
     parentId = parentComment?.id,

diff --git a/...tence/src/main/kotlin/com/github/danzx/xof/dataprovider/jpa/adapter/mapper/PostMappers.kt b/...tence/src/main/kotlin/com/github/danzx/xof/dataprovider/jpa/adapter/mapper/PostMappers.kt
@@ -10,7 +10,7 @@ fun Post.toPostJpaEntity(user: UserJpaEntity) = PostJpaEntity(
     title = title,
     content = content,
     created = created,
-    updated = created,
+    updated = updated,
     user = user
 )