Merge pull request #49 from rwth-acis/upgrade

Upgrade dependencies
rwth-acis · Aug 16, 2021 · a73f2be · a73f2be
2 parents b82884d + 772d423
commit a73f2be
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 17 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,29 +1,40 @@
 # Changelog
+
 All notable changes to this project will be documented in this file.
 
-The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
-and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres
+to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
-Releases prior to v0.6.0 are only documented on the [GitHub Release Page](https://github.com/rwth-acis/las2peer-ActivityTracker/releases)
+Releases prior to v0.6.0 are only documented on
+the [GitHub Release Page](https://github.com/rwth-acis/las2peer-ActivityTracker/releases)
 
 ## [Unreleased]
 
 ### Added
+
 - Added new testcases [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
 - Add returned data models to swagger annotations [#46](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/46)
 
 ### Changed
-- Updated dependencies (las2peer 1.1.0 and thereby requiring Java 14) [#41](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/41), [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
+
+- Updated dependencies (las2peer 1.1.2 and thereby requiring Java
+    14) [#41](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/41)
+        , [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43),
+        [#49](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/49)
 - Changed buildsystem to gradle [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
-- Automatically generate jooq code from migration files at build time [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
-- Move to multi-staged docker build for slimmer target image [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
+- Automatically generate jooq code from migration files at build
+  time [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
+- Move to multi-staged docker build for slimmer target
+  image [#43](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/43)
 - Replaced vtor with Java Bean Validation [#44](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/44)
 - Remove static code from data classes and generate getter/setters and builder with
   lombok. [#46](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/46)
+- Switch backend database to postgres [#48](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/48)
 
 ### Removed
 
-- `additionalObject` filtering capabilities in `GET /activities` endpoint [#44](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/44)
+- `additionalObject` filtering capabilities in `GET /activities`
+  endpoint [#44](https://github.com/rwth-acis/las2peer-ActivityTracker/pull/44)
 
 ## [0.6.0] - 2019-02-19
 

diff --git a/...racker/src/main/java/de/rwth/dbis/acis/activitytracker/service/dal/entities/Activity.java b/...racker/src/main/java/de/rwth/dbis/acis/activitytracker/service/dal/entities/Activity.java
@@ -12,7 +12,7 @@
 
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
-import java.time.LocalDateTime;
+import java.time.OffsetDateTime;
 
 @EqualsAndHashCode(callSuper = true)
 @Data
@@ -23,8 +23,8 @@ public class Activity extends EntityBase {
     private int id;
 
     @NotNull
-    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss")
-    private LocalDateTime creationDate;
+    @JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSZ")
+    private OffsetDateTime creationDate;
 
     @NotNull
     @Size(min = 1, max = 255)

diff --git a/activity_tracker/src/main/resources/changelog.yaml b/activity_tracker/src/main/resources/changelog.yaml
@@ -15,9 +15,9 @@ databaseChangeLog:
               - column:
                   constraints:
                     nullable: false
-                  defaultValueComputed: CURRENT_TIMESTAMP
+                  defaultValueComputed: now()
                   name: creation_date
-                  type: timestamp
+                  type: TIMESTAMP WITH TIME ZONE
               - column:
                   constraints:
                     nullable: false

diff --git a/..._tracker/src/test/java/de/rwth/dbis/acis/activitytracker/service/ActivityTrackerTest.java b/..._tracker/src/test/java/de/rwth/dbis/acis/activitytracker/service/ActivityTrackerTest.java
@@ -121,8 +121,8 @@ public void testGetVersion() {
     public void testCreateActivity() {
         try {
             MiniClient client = getClient();
-            
-            String testActivity = "{ \"id\": 8524, \"creationDate\": \"2021-01-05T16:30:34\", \"activityAction\": \"UPDATE\", \"origin\": \"reqbaz\", \"dataUrl\": \"https://requirements-bazaar.org/bazaar/requirements/1234\", \"dataType\": \"REQUIREMENT\", \"dataFrontendUrl\": \"https://requirements-bazaar.org/projects/426/categories/1234/requirements/1234\", \"parentDataUrl\": \"https://requirements-bazaar.org/bazaar/categories/1234\", \"parentDataType\": \"CATEGORY\", \"userUrl\": \"https://requirements-bazaar.org/bazaar/users/1234\", \"additionalObject\": {  \"user\": {   \"id\": 1234  },  \"project\": {   \"id\": 1234,   \"name\": \"Project\"  },  \"category\": {   \"id\": 1234,   \"name\": \"Group\"  },  \"requirement\": {   \"id\": 1234,   \"name\": \"User Stories\"  } }, \"data\": {  \"id\": 1234,  \"name\": \"User Stories\",  \"description\": \"...\",  \"projectId\": 1234,  \"creator\": {   \"id\": 1234,   \"userName\": \"...\",   \"firstName\": \"...\",   \"lastName\": \"...\",   \"admin\": false,   \"las2peerId\": 1234,   \"profileImage\": \"https://api.learning-layers.eu/profile.png\",   \"emailLeadSubscription\": true,   \"emailFollowSubscription\": true  },  \"categories\": [   {    \"id\": 1234,    \"name\": \"Group\",    \"description\": \"Requirements for Group\",    \"projectId\": 1234   }  ],  \"creationDate\": \"2021-01-05T14:27:30\",  \"lastUpdatedDate\": \"2021-01-05T16:30:34\",  \"numberOfComments\": 0,  \"numberOfAttachments\": 0,  \"numberOfFollowers\": 2,  \"upVotes\": 0,  \"downVotes\": 0,  \"userVoted\": \"NO_VOTE\" }, \"parentData\": {  \"id\": 1234,  \"name\": \"Group\",  \"description\": \"Requirements for Group\",  \"projectId\": 1234,  \"leader\": {   \"id\": 1234,   \"userName\": \"...\",   \"firstName\": \"...\",   \"lastName\": \"...\",   \"admin\": false,   \"las2peerId\": 1234,   \"profileImage\": \"https://api.learning-layers.eu/profile.png\",   \"emailLeadSubscription\": true,   \"emailFollowSubscription\": true  },  \"creationDate\": \"2020-11-03T15:23:12\",  \"lastUpdatedDate\": \"2021-01-05T14:18:31\",  \"numberOfRequirements\": 5,  \"numberOfFollowers\": 2 }, \"user\": {  \"id\": 1234,  \"userName\": \"...\",  \"firstName\": \"...\",  \"lastName\": \"...\",  \"admin\": false,  \"las2peerId\": 1234,  \"profileImage\": \"https://api.learning-layers.eu/profile.png\",  \"emailLeadSubscription\": true,  \"emailFollowSubscription\": true,  \"creationDate\": \"2020-11-02T10:37:13\",  \"lastLoginDate\": \"2021-01-05T16:34:35\" }}";
+
+            String testActivity = "{ \"id\": 8524, \"creationDate\": \"2021-08-08T01:56:58.057+0200\", \"activityAction\": \"UPDATE\", \"origin\": \"reqbaz\", \"dataUrl\": \"https://requirements-bazaar.org/bazaar/requirements/1234\", \"dataType\": \"REQUIREMENT\", \"dataFrontendUrl\": \"https://requirements-bazaar.org/projects/426/categories/1234/requirements/1234\", \"parentDataUrl\": \"https://requirements-bazaar.org/bazaar/categories/1234\", \"parentDataType\": \"CATEGORY\", \"userUrl\": \"https://requirements-bazaar.org/bazaar/users/1234\", \"additionalObject\": {  \"user\": {   \"id\": 1234  },  \"project\": {   \"id\": 1234,   \"name\": \"Project\"  },  \"category\": {   \"id\": 1234,   \"name\": \"Group\"  },  \"requirement\": {   \"id\": 1234,   \"name\": \"User Stories\"  } }, \"data\": {  \"id\": 1234,  \"name\": \"User Stories\",  \"description\": \"...\",  \"projectId\": 1234,  \"creator\": {   \"id\": 1234,   \"userName\": \"...\",   \"firstName\": \"...\",   \"lastName\": \"...\",   \"admin\": false,   \"las2peerId\": 1234,   \"profileImage\": \"https://api.learning-layers.eu/profile.png\",   \"emailLeadSubscription\": true,   \"emailFollowSubscription\": true  },  \"categories\": [   {    \"id\": 1234,    \"name\": \"Group\",    \"description\": \"Requirements for Group\",    \"projectId\": 1234   }  ],  \"creationDate\": \"2021-08-08T01:56:58.057+0200\",  \"lastUpdatedDate\": \"2021-01-05T16:30:34.057+0200\",  \"numberOfComments\": 0,  \"numberOfAttachments\": 0,  \"numberOfFollowers\": 2,  \"upVotes\": 0,  \"downVotes\": 0,  \"userVoted\": \"NO_VOTE\" }, \"parentData\": {  \"id\": 1234,  \"name\": \"Group\",  \"description\": \"Requirements for Group\",  \"projectId\": 1234,  \"leader\": {   \"id\": 1234,   \"userName\": \"...\",   \"firstName\": \"...\",   \"lastName\": \"...\",   \"admin\": false,   \"las2peerId\": 1234,   \"profileImage\": \"https://api.learning-layers.eu/profile.png\",   \"emailLeadSubscription\": true,   \"emailFollowSubscription\": true  },  \"creationDate\": \"2020-11-03T15:23:12.057+0200\",  \"lastUpdatedDate\": \"2021-01-05T14:18:31.057+0200\",  \"numberOfRequirements\": 5,  \"numberOfFollowers\": 2 }, \"user\": {  \"id\": 1234,  \"userName\": \"...\",  \"firstName\": \"...\",  \"lastName\": \"...\",  \"admin\": false,  \"las2peerId\": 1234,  \"profileImage\": \"https://api.learning-layers.eu/profile.png\",  \"emailLeadSubscription\": true,  \"emailFollowSubscription\": true,  \"creationDate\": \"2020-11-02T10:37:13.057+0200\",  \"lastLoginDate\": \"2021-01-05T16:34:35.057+0200\" }}";
 
             // testInput is the pathParam
             ClientResponse result = client.sendRequest("POST", mainPath, testActivity,

diff --git a/gradle.properties b/gradle.properties
@@ -1,13 +1,13 @@
 org.gradle.parallel=true
 java.version=14
-core.version=1.1.0
+core.version=1.1.2
 service.version=0.8.0
 service.name=de.rwth.dbis.acis.activitytracker.service
 service.class=ActivityTrackerService
 jooq.version=3.14.4
 mysql.version=8.0.22
-postgres.version=42.2.12
-liquibase.version=4.4.0
+postgres.version=42.2.23
+liquibase.version=4.4.3
 db.port=5432
 db.hostname=localhost
 db.user=reqbaz