From ccea0d393c2fbaca9cc9c7f009389d041a6ae8dc Mon Sep 17 00:00:00 2001 From: mirrerror Date: Thu, 21 Sep 2023 10:21:31 +0300 Subject: [PATCH] Added main controller and user entity --- ...GetHelloWorld.java => MainController.java} | 10 +++++- src/main/java/entities/Role.java | 7 ++++ src/main/java/entities/User.java | 32 +++++++++++++++++++ 3 files changed, 48 insertions(+), 1 deletion(-) rename src/main/java/com/faf223/expensetrackerfaf/controllers/{GetHelloWorld.java => MainController.java} (54%) create mode 100644 src/main/java/entities/Role.java create mode 100644 src/main/java/entities/User.java diff --git a/src/main/java/com/faf223/expensetrackerfaf/controllers/GetHelloWorld.java b/src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java similarity index 54% rename from src/main/java/com/faf223/expensetrackerfaf/controllers/GetHelloWorld.java rename to src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java index 6ee56ac..1626d98 100644 --- a/src/main/java/com/faf223/expensetrackerfaf/controllers/GetHelloWorld.java +++ b/src/main/java/com/faf223/expensetrackerfaf/controllers/MainController.java @@ -1,13 +1,21 @@ package com.faf223.expensetrackerfaf.controllers; +import entities.User; import org.springframework.web.bind.annotation.GetMapping; +import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.RestController; @RestController -class GetHelloWorld { +public class MainController { @GetMapping("/") public String helloWorld() { return "Hello, World!"; } + + @GetMapping("/users/{id}") + public User getUser(@PathVariable int id) { + return new User(id, "Test"); + } + } diff --git a/src/main/java/entities/Role.java b/src/main/java/entities/Role.java new file mode 100644 index 0000000..258e49e --- /dev/null +++ b/src/main/java/entities/Role.java @@ -0,0 +1,7 @@ +package entities; + +public enum Role { + + UNREGISTERED, REGISTERED, ADMIN; + +} diff --git a/src/main/java/entities/User.java b/src/main/java/entities/User.java new file mode 100644 index 0000000..ee467a1 --- /dev/null +++ b/src/main/java/entities/User.java @@ -0,0 +1,32 @@ +package entities; + +public class User { + + private long id; + private String name; + private String email; + private String login; + private String password; + private Role role; + + public User(long id, String name) { + this.id = id; + this.name = name; + } + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} -- 2.49.1