diff --git a/.vscode/tasks.json b/.vscode/tasks.json new file mode 100644 index 0000000..73049df --- /dev/null +++ b/.vscode/tasks.json @@ -0,0 +1,38 @@ +{ + "version": "2.0.0", + "tasks": [ + { + "label": "Compile Spring Boot App", + "type": "shell", + "command": "${workspaceFolder}/gradlew", + "args": [ + "compileJava" + ], + "group": { + "kind": "build", + "isDefault": true + }, + "problemMatcher": [], + "presentation": { + "reveal": "always", + "panel": "new" + } + }, + { + "label": "Run Spring Boot App", + "type": "shell", + "command": "${workspaceFolder}/gradlew", + "args": [ + "bootRun", + "--args='--spring.profiles.active=dev'" + ], + "group": "none", + "problemMatcher": [], + "presentation": { + "reveal": "always", + "panel": "new" + }, + "isBackground": true + } + ] +} diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index e382118..0b55a3b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,5 +1,5 @@ distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-8.12.1-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-8.14.2-bin.zip zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists diff --git a/src/main/java/org/udg/pds/springtodo/Global.java b/src/main/java/org/udg/pds/springtodo/Global.java index 87ec3db..cb91e30 100644 --- a/src/main/java/org/udg/pds/springtodo/Global.java +++ b/src/main/java/org/udg/pds/springtodo/Global.java @@ -9,6 +9,9 @@ import org.springframework.stereotype.Service; import org.udg.pds.springtodo.entity.Tag; import org.udg.pds.springtodo.entity.User; +import org.udg.pds.springtodo.repository.TagRepository; +import org.udg.pds.springtodo.repository.TaskRepository; +import org.udg.pds.springtodo.repository.UserRepository; import org.udg.pds.springtodo.service.TagService; import org.udg.pds.springtodo.service.TaskService; import org.udg.pds.springtodo.service.UserService; @@ -34,6 +37,18 @@ public class Global { private TagService tagService; + @Autowired + private + UserRepository userRepository; + + @Autowired + private + TaskRepository taskRepository; + + @Autowired + private + TagRepository tagRepository; + @Value("${spring.profiles.active}") private String activeProfile; @@ -83,6 +98,11 @@ void init() { private void initData() { if (activeProfile.equals("dev")) { + logger.info("Clearing database ..."); + taskRepository.deleteAll(); + tagRepository.deleteAll(); + userRepository.deleteAll(); + logger.info("Starting populating database ..."); User user = userService.register("usuari", "usuari@hotmail.com", "123456"); diff --git a/src/main/java/org/udg/pds/springtodo/entity/Task.java b/src/main/java/org/udg/pds/springtodo/entity/Task.java index 8a7548b..7515802 100644 --- a/src/main/java/org/udg/pds/springtodo/entity/Task.java +++ b/src/main/java/org/udg/pds/springtodo/entity/Task.java @@ -36,30 +36,6 @@ public Task(ZonedDateTime dateCreated, ZonedDateTime dateLimit, Boolean complete this.text = text; } - public ZonedDateTime getDateCreated() { - return dateCreated; - } - - public ZonedDateTime getDateLimit() { - return dateLimit; - } - - public Boolean getCompleted() { - return completed; - } - - public String getText() { - return text; - } - - public User getUser() { - return user; - } - - public void setUser(User user) { - this.user = user; - } - public void addTag(Tag tag) { tags.add(tag); } diff --git a/src/main/java/org/udg/pds/springtodo/entity/User.java b/src/main/java/org/udg/pds/springtodo/entity/User.java index c8dcaac..1de2f28 100644 --- a/src/main/java/org/udg/pds/springtodo/entity/User.java +++ b/src/main/java/org/udg/pds/springtodo/entity/User.java @@ -68,4 +68,20 @@ public void addTask(Task task) { tasks.add(task); } + public String getUsername() { + return username; + } + + public String getEmail() { + return email; + } + + public String getPassword() { + return password; + } + + public Collection getTasks() { + return tasks; + } + }