Finish activity class and add tests

src/Client/src/main/java/greenify/client/rest/ActivityService.java

@@ -1,25 +0,0 @@
-package greenify.client.rest;
-
-import greenify.common.ActivityDTO;
-import greenify.common.ApplicationException;
-import greenify.common.UserDTO;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-
-public class ActivityService {
-
-        Logger logger = LoggerFactory.getLogger(greenify.server.service.ActivityService.class);
-        @Autowired
-        UserRepository userRepository;
-
-        /**
-         * Adds the activity to the history of the user and adds the score.
-         * @param name the name of the activity
-         * @return a activityDTO of activity.
-         */
-        public ActivityDTO addActivity(String name) {
-
-        }
-
-}

src/Server/src/main/java/greenify/server/data/model/Activity.java

@@ -1,31 +1,22 @@
 package greenify.server.data.model;
 
 import lombok.Data;
-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")
+
 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;
@@ -48,7 +39,6 @@ public abstract class Activity {
      * gets the id.
      * @return the id
      */
-
     public Long getId() {
         return id;
     }
@@ -110,6 +100,7 @@ public abstract class Activity {
         this.score = score;
     }
 
+
     /**
      * Returns a human readable object. It's in JSON.
      * @return the JSON form of the object.
@@ -140,5 +131,4 @@ public abstract class Activity {
     public int hashCode() {
         return Objects.hash(id, name, description, score);
     }
-
 }

src/Server/src/main/java/greenify/server/service/ActivityService.java

@@ -1,6 +0,0 @@
-package greenify.server.service;
-
-public class ActivityService {
-
-
-}