From 5f4069fcadcc0dacdcf62d5c1be5b63f99b7cc6f Mon Sep 17 00:00:00 2001
From: Merel Steenbergen <m.a.steenbergen@student.tudelft.nl>
Date: Thu, 14 Mar 2019 14:04:04 +0100
Subject: [PATCH] Add outline of activity class, has bugs

---
 .../greenify/server/data/model/Activity.java   | 18 ++++++++++++++----
 .../java/greenify/server/data/model/User.java  |  1 +
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/src/Server/src/main/java/greenify/server/data/model/Activity.java b/src/Server/src/main/java/greenify/server/data/model/Activity.java
index 01a2e02..7047591 100644
--- a/src/Server/src/main/java/greenify/server/data/model/Activity.java
+++ b/src/Server/src/main/java/greenify/server/data/model/Activity.java
@@ -6,17 +6,26 @@ import lombok.NoArgsConstructor;
 import javax.accessibility.AccessibleValue;
 import javax.persistence.*;
 import java.util.Objects;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import java.util.Scanner;
 
 @Entity
 @Data
 @Table(name = "activities")
-//@AllArgsConstructor
 public class Activity {
 
     @Id
     @GeneratedValue(strategy = GenerationType.AUTO)
     long id;
+//@AllArgsConstructor
+public abstract class Activity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.AUTO)
+    Long id;
     String name;
     String description;
     int score;
@@ -39,7 +48,8 @@ public class Activity {
      * gets the id.
      * @return the id
      */
-    public long getId() {
+
+    public Long getId() {
         return id;
     }
 
@@ -72,7 +82,7 @@ public class Activity {
      * sets the id.
      * @param id the you want to assign to this.id.
      */
-    public void setId(long id) {
+    public void setId(Long id) {
         this.id = id;
     }
 
@@ -100,7 +110,6 @@ public class Activity {
         this.score = score;
     }
 
-
     /**
      * Returns a human readable object. It's in JSON.
      * @return the JSON form of the object.
@@ -131,4 +140,5 @@ public class Activity {
     public int hashCode() {
         return Objects.hash(id, name, description, score);
     }
+
 }
\ No newline at end of file
diff --git a/src/Server/src/main/java/greenify/server/data/model/User.java b/src/Server/src/main/java/greenify/server/data/model/User.java
index d588eb1..6ae1457 100644
--- a/src/Server/src/main/java/greenify/server/data/model/User.java
+++ b/src/Server/src/main/java/greenify/server/data/model/User.java
@@ -11,6 +11,7 @@ import java.util.Objects;
 @Entity
 @Data
 @Table(name = "users")
+
 public class User {
 
     @Id