Merge branch 'backend-preparations' into 'master'

Backend preparations

See merge request marcel.schwarz/2020ss-qbc-geofence-timetracking!37

backend/Dockerfile

@@ -6,5 +6,5 @@ RUN ["gradle", "bootJar"]
 FROM openjdk:11-jre-slim
 WORKDIR /root
 COPY --from=build /root/build/libs/*.jar app.jar
-EXPOSE 80
+EXPOSE 5000
 ENTRYPOINT ["java", "-jar", "app.jar"]

backend/src/main/java/de/hft/geotime/record/TimeRecord.java

@@ -20,7 +20,7 @@ public class TimeRecord {
     @Id
     private long id;
     @OneToOne
-    private TimetrackAccount account;
+    private TimetrackAccount account; // TimetrackAccount ID (Lazy)
     private Date startdate;
     private Date enddate;
     private Duration time;

backend/src/main/java/de/hft/geotime/timetrackaccount/TimetrackAccount.java

@@ -17,7 +17,7 @@ public class TimetrackAccount {
     @GeneratedValue(strategy = GenerationType.AUTO)
     private long id;
     @OneToOne
-    private TimetrackUser timetrackUser;
+    private TimetrackUser timetrackUser; // TimetrackUser Id (Lazy) [REMOVE]
     private double revenue;
     private String name;
     private String description;

backend/src/main/java/de/hft/geotime/user/TimetrackUser.java

@@ -21,12 +21,12 @@ public class TimetrackUser {
     private long id;
     @UniqueElements
     private String username;
-    private String password;
+    private String password;        // strip
     private String firstname;
     private String lastname;
     @OneToOne
-    private Role role;
+    private Role role;              // Projection (String)
     @OneToMany
-    private List<TimetrackAccount> timetrackAccounts;
+    private List<TimetrackAccount> timetrackAccounts; // Lazy List
 
 }

backend/src/main/resources/application.properties

@@ -1,4 +1,4 @@
-server.port=80
+server.port=5000
 spring.datasource.hikari.initialization-fail-timeout=0
 spring.datasource.hikari.max-lifetime=300000
 spring.jpa.show-sql=true

docker-compose.yml

@@ -15,7 +15,7 @@ services:
     build:
       context: ./backend
     ports:
-      - "5000:80"
+      - "5000:5000"
     depends_on: 
       - db