From f4f8b32fc7f84bd130440bd3011ea04e6b01aa13 Mon Sep 17 00:00:00 2001 From: gg12 darfren Date: Mon, 22 Apr 2024 17:35:18 +0400 Subject: [PATCH] ok --- data.mv.db | Bin 32768 -> 49152 bytes .../demo/groups/api/GroupController.java | 2 +- .../demo/groups/model/GroupEntity.java | 3 ++- .../demo/members/api/MemberController.java | 2 +- .../demo/members/model/MemberEntity.java | 2 +- 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/data.mv.db b/data.mv.db index 5afe7b2d75627f4d305b936ffab2aa028b1b1f96..63eda8d1ed314cadd5855d24c8594a94dd389e65 100644 GIT binary patch literal 49152 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

4_ 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 diff --git a/demo/src/main/java/com/example/demo/groups/api/GroupController.java b/demo/src/main/java/com/example/demo/groups/api/GroupController.java index 7954f51..643aa75 100644 --- a/demo/src/main/java/com/example/demo/groups/api/GroupController.java +++ b/demo/src/main/java/com/example/demo/groups/api/GroupController.java @@ -22,7 +22,7 @@ import com.example.demo.users.service.UserService; import jakarta.validation.Valid; @RestController -@RequestMapping(Constants.API_URL + "/group") +@RequestMapping(Constants.API_URL + "/user/{user}/group") public class GroupController { private final GroupService groupService; private final UserService userService; diff --git a/demo/src/main/java/com/example/demo/groups/model/GroupEntity.java b/demo/src/main/java/com/example/demo/groups/model/GroupEntity.java index e91d91c..5af7dea 100644 --- a/demo/src/main/java/com/example/demo/groups/model/GroupEntity.java +++ b/demo/src/main/java/com/example/demo/groups/model/GroupEntity.java @@ -19,9 +19,10 @@ import jakarta.persistence.Table; @Entity @Table(name = "groups") + public class GroupEntity extends BaseEntity { @ManyToOne - @JoinColumn(name = "typeId", nullable = false) + @JoinColumn(name = "userId", nullable = false) private UserEntity user; @Column(nullable = false, length = 30) private String name; diff --git a/demo/src/main/java/com/example/demo/members/api/MemberController.java b/demo/src/main/java/com/example/demo/members/api/MemberController.java index 73bf944..8e4067b 100644 --- a/demo/src/main/java/com/example/demo/members/api/MemberController.java +++ b/demo/src/main/java/com/example/demo/members/api/MemberController.java @@ -21,7 +21,7 @@ import com.example.demo.groups.service.GroupService; import jakarta.validation.Valid; @RestController -@RequestMapping(Constants.API_URL + "/member") +@RequestMapping(Constants.API_URL + "/user/{user}/group/{group}/member") public class MemberController { private final MemberService memberService; private final GroupService groupService; diff --git a/demo/src/main/java/com/example/demo/members/model/MemberEntity.java b/demo/src/main/java/com/example/demo/members/model/MemberEntity.java index 698cd39..5bec992 100644 --- a/demo/src/main/java/com/example/demo/members/model/MemberEntity.java +++ b/demo/src/main/java/com/example/demo/members/model/MemberEntity.java @@ -16,7 +16,7 @@ import jakarta.persistence.Table; @Table(name = "members") public class MemberEntity extends BaseEntity { @ManyToOne - @JoinColumn(name = "typeId", nullable = false) + @JoinColumn(name = "groupdId", nullable = false) private GroupEntity group; @Column(nullable = false, length = 50) private String name;