main to pwa

.gitignore

@@ -102,3 +102,7 @@ testem.log
 # System Files
 .DS_Store
 Thumbs.db
+.idea/workspace.xml
+.idea/vcs.xml
+.idea/progress_tracker.iml
+.idea/modules.xml

README.md

@@ -1,3 +1,2 @@
-https://dbdiagram.io/d/61d9b7b4f8370f0a2ee67553
-
-http://localhost:8080/swagger-ui/index.html
+BEng thesis, all details described here:
+https://github.com/Fariusz/progress_tracker/blob/5d58509860e5fef9c6be81173061fa6ac5b0b655/Radoslaw_Loth_praca_inzynierska.pdf

backend/src/main/java/com/rloth/progress_tracker/controllers/ActivityController.java

@@ -23,13 +23,17 @@ public List<Activity> getUserActivities(@AuthenticationPrincipal String username
         return activityService.getUserActivities(username);
     }
 
+    @GetMapping("/userActivitiesByListId/{id}")
+    public List<Activity> userActivitiesByListId(@PathVariable long id) {
+        return activityService.userActivitiesByListId(id);
+    }
+
     @GetMapping("/userActivities/pageable")
     public List<Activity> getUserActivitiesPageable(@AuthenticationPrincipal String username, @RequestParam(required = false) Integer page, @RequestParam(required = false) Integer pageSize, Sort.Direction sort) {
 
         int pageNumber = page != null && page > 0 ? page : 1;
         Sort.Direction sortDirection = sort != null ? sort : Sort.Direction.ASC;
         return activityService.getUserActivitiesPageable(username, pageNumber - 1, pageSize, sortDirection);
-
     }
 
     @GetMapping("/activities")

backend/src/main/java/com/rloth/progress_tracker/controllers/ContentController.java

@@ -18,6 +18,8 @@ public List<Content> getContent() {
         return contentService.getContent();
     }
 
+
+
     @GetMapping("/content/{id}")
     public List<Content> getActivityContent(@PathVariable long id) {
         return contentService.getActivityContent(id);

backend/src/main/java/com/rloth/progress_tracker/controllers/ListController.java

@@ -0,0 +1,42 @@
+package com.rloth.progress_tracker.controllers;
+
+import com.rloth.progress_tracker.models.ActivitiesList;
+import com.rloth.progress_tracker.services.ListService;
+import lombok.RequiredArgsConstructor;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.web.bind.annotation.*;
+
+import java.util.List;
+
+@RestController
+@RequiredArgsConstructor
+public class ListController {
+
+    private final ListService listService;
+
+    @GetMapping("/lists")
+    public List<ActivitiesList> getLists() {
+        return listService.getLists();
+    }
+
+    @GetMapping("/userLists")
+    public List<ActivitiesList> getUserLists(@AuthenticationPrincipal String username) {
+        return listService.getUserLists(username);
+    }
+
+    @PostMapping("/list")
+    public ActivitiesList addList(@RequestBody ActivitiesList list, @AuthenticationPrincipal String username) {
+        return listService.addList(list, username);
+    }
+
+    @PutMapping("/list")
+    public ActivitiesList editList(@RequestBody ActivitiesList list) {
+        return listService.editList(list);
+    }
+
+    @DeleteMapping("/list/{id}")
+    public void deleteList(@PathVariable long id) {
+        listService.deleteList(id);
+    }
+
+}

backend/src/main/java/com/rloth/progress_tracker/controllers/LoginController.java

@@ -33,11 +33,9 @@ public ResponseEntity<String> processRegister(@RequestBody UserDto accountDto) {
             return new ResponseEntity<>("{\n" + "  \"message\" : \"EMAIL_EXISTS\"\n" + "}\n", HttpStatus.BAD_REQUEST);
         } else if (loginService.usernameExist(accountDto)) {
             return new ResponseEntity<>("{\n" + "  \"message\" : \"USERNAME_EXISTS\"\n" + "}\n", HttpStatus.BAD_REQUEST);
-        } else if (!loginService.emailExist(accountDto) || !loginService.usernameExist(accountDto)) {
+        } else {
             loginService.register(accountDto);
             return new ResponseEntity<>("{\n" + "  \"message\" : \"REGISTER_SUCCESS\"\n" + "}\n", HttpStatus.CREATED);
-        } else {
-            return new ResponseEntity<>("{\n" + "  \"message\" : \"UNKNOWN\"\n" + "}\n", HttpStatus.NOT_IMPLEMENTED);
         }
     }
 

backend/src/main/java/com/rloth/progress_tracker/models/ActivitiesList.java

@@ -0,0 +1,26 @@
+package com.rloth.progress_tracker.models;
+
+import lombok.Getter;
+import lombok.Setter;
+
+import javax.persistence.*;
+import java.time.LocalDateTime;
+import java.util.List;
+
+@Entity
+@Getter
+@Setter
+public class ActivitiesList {
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private long id;
+    private String listName;
+    private boolean isTraining;
+    private long authorId;
+    private LocalDateTime created;
+
+    //Relacja jeden (Activity) do wielu (Content)
+    @OneToMany(cascade = CascadeType.REMOVE)
+    @JoinColumn(name = "listId", updatable = false, insertable = false)
+    private List<Activity> activities;
+}

backend/src/main/java/com/rloth/progress_tracker/models/Activity.java

@@ -14,8 +14,9 @@ public class Activity {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private long id;
+    private long listId;
     private String activityName;
-    private long author_id;
+    private long authorId;
     private LocalDateTime created;
 
     //Relacja jeden (Activity) do wielu (Content)

backend/src/main/java/com/rloth/progress_tracker/models/Content.java

@@ -7,6 +7,7 @@
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 
 @Entity
@@ -18,6 +19,7 @@ public class Content {
     private long id;
     private long activityId;
     private String content;
-    private LocalDateTime created;
+    private String repetitions;
+    private LocalDate created;
 }
 

backend/src/main/java/com/rloth/progress_tracker/repos/ActivityRepository.java

@@ -19,15 +19,18 @@ public interface ActivityRepository extends JpaRepository<Activity, Long> {
     @Query("select distinct a from Activity a" + " left join fetch a.content")
     List<Activity> findAllActivitiesPageable(Pageable page);
 
-    @Query("select a from Activity a where author_id = ?1")
+    @Query("select a from Activity a where authorId = ?1")
     List<Activity> findActivitiesByUserId(Long id);
 
-    @Query("select a from Activity a where author_id = ?1")
+    @Query("select a from Activity a where authorId = ?1")
     List<Activity> findActivitiesByUserIdPageable(Long id, Pageable page);
 
+    @Query("select a from Activity a where listId = ?1")
+    List<Activity> findAllByListId(long id);
+
 
 /*
-    findAllByActivityName i findActivityWithContent działają w jednakowy sposób XDD
+    findAllByActivityName i findActivityWithContent działają w jednakowy sposób
 
     @Query("select a from Activity a" + " left join fetch a.content" + " where activity_name = :name")
     Activity findActivityWithContent(@Param("name") String name);

backend/src/main/java/com/rloth/progress_tracker/repos/ListRepository.java

@@ -0,0 +1,12 @@
+package com.rloth.progress_tracker.repos;
+
+import com.rloth.progress_tracker.models.ActivitiesList;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+
+import java.util.List;
+
+public interface ListRepository extends JpaRepository<ActivitiesList, Long> {
+    @Query("select a from ActivitiesList a where authorId = ?1")
+    List<ActivitiesList> findListsByUserId(Long userId);
+}

backend/src/main/java/com/rloth/progress_tracker/services/ActivityService.java

@@ -79,7 +79,7 @@ private List<Content> extractContents(List<Content> contents, long id) {
     }
 
     public Activity addActivity(Activity activity, String username) {
-        activity.setAuthor_id(loginService.getUserId(username));
+        activity.setAuthorId(loginService.getUserId(username));
         return activityRepository.save(activity);
     }
 
@@ -101,4 +101,8 @@ public void deleteActivity(long id) {
     public void clearActivities() {
         //Ta metoda czyści Cache
     }
+
+    public List<Activity> userActivitiesByListId(long id) {
+        return activityRepository.findAllByListId(id);
+    }
 }

backend/src/main/java/com/rloth/progress_tracker/services/ContentService.java

@@ -6,6 +6,7 @@
 import org.springframework.stereotype.Service;
 
 import javax.transaction.Transactional;
+import java.time.LocalDateTime;
 import java.util.Collections;
 import java.util.List;
 
@@ -36,6 +37,7 @@ public Content editContent(Content content) {
         Content contentEdited = contentRepository.findById(content.getId()).orElseThrow();
         contentEdited.setContent(content.getContent());
         contentEdited.setCreated(content.getCreated());
+        contentEdited.setRepetitions(content.getRepetitions());
         return contentEdited;
     }
 }

backend/src/main/java/com/rloth/progress_tracker/services/ListService.java

@@ -0,0 +1,42 @@
+package com.rloth.progress_tracker.services;
+
+import com.rloth.progress_tracker.models.ActivitiesList;
+import com.rloth.progress_tracker.repos.ListRepository;
+import lombok.RequiredArgsConstructor;
+import org.springframework.stereotype.Service;
+
+import javax.transaction.Transactional;
+import java.util.List;
+
+@Service
+@RequiredArgsConstructor
+public class ListService {
+
+    private final ListRepository listRepository;
+    private final LoginService loginService;
+
+    public List<ActivitiesList> getLists() {
+        return listRepository.findAll();
+    }
+
+    public List<ActivitiesList> getUserLists(String username) {
+        return listRepository.findListsByUserId(loginService.getUserId(username));
+    }
+
+    public ActivitiesList addList(ActivitiesList list, String username) {
+        list.setAuthorId(loginService.getUserId(username));
+        return listRepository.save(list);
+    }
+
+    @Transactional
+    public ActivitiesList editList(ActivitiesList list) {
+        ActivitiesList listEdited = listRepository.findById(list.getId()).orElseThrow();
+        listEdited.setListName(list.getListName());
+        listEdited.setActivities(list.getActivities());
+        return listEdited;
+    }
+
+    public void deleteList(long id) {
+        listRepository.deleteById(id);
+    }
+}

backend/src/main/resources/database/2021-11-01/01-create-activity.sql

@@ -1,10 +1,24 @@
 --liquibase formatted sql
 --changeset rloth:1
 
+CREATE TABLE activities_list
+(
+    id            BIGINT AUTO_INCREMENT PRIMARY KEY,
+    list_name     VARCHAR(400) NOT NULL,
+    is_training   BOOLEAN NOT NULL,
+    author_id     BIGINT,
+    created       timestamp
+);
+
 CREATE TABLE activity
 (
     id            BIGINT AUTO_INCREMENT PRIMARY KEY,
+    list_id       BIGINT        NOT NULL,
     activity_name VARCHAR(400) NOT NULL,
     author_id     BIGINT,
     created       timestamp
-);
+);
+
+ALTER TABLE activity
+    ADD CONSTRAINT activity_list_id
+        FOREIGN KEY (list_id) REFERENCES activities_list (id);

backend/src/main/resources/database/2021-11-01/02-create-content.sql

@@ -6,6 +6,7 @@ CREATE TABLE content
     id          BIGINT AUTO_INCREMENT PRIMARY KEY,
     activity_id BIGINT        NOT NULL,
     content     VARCHAR(2000) NULL,
+    repetitions VARCHAR(100) NULL,
     created     timestamp
 );