Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat/#58 group service #61

Merged
merged 22 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from 16 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
bfe5ccd
feat: add group entity
Sion99 Nov 15, 2023
c4a2a4c
feat: add Group list service
Sion99 Nov 15, 2023
c85a466
refactor: add group description and change Dto
Sion99 Nov 15, 2023
406a880
feat: add group create service
Sion99 Nov 15, 2023
256fdc4
feat: add group create service
Sion99 Nov 15, 2023
8b4876f
Merge branch 'feat/#58-group-service' of https://github.com/PrayHelpe…
Sion99 Nov 15, 2023
f22b047
refactor: change GroupResponseDto
Sion99 Nov 15, 2023
0109e53
chore: remove unnecessary code
Sion99 Nov 15, 2023
c179e84
feat: add validation to GroupResponseDto
Sion99 Nov 15, 2023
aa89bca
feat: add changeGroupName, changeGroupLeader, kickGroupMember, delete…
Sion99 Nov 15, 2023
713e55b
feat: add validation to GroupRequestDto
Sion99 Nov 16, 2023
42079d3
chore: fix tab indent
Sion99 Nov 17, 2023
e0650ac
feat: add addGroupMember, leaveGroup
Sion99 Nov 17, 2023
344ec52
feat: add Group to initDb
Sion99 Nov 17, 2023
aa518d2
fix: fix certain logic that prevents group leaders from leaving a group
Sion99 Nov 18, 2023
65007f1
fix: build connection between member and group
Sion99 Nov 18, 2023
bb96f67
chore: change import to static import
Sion99 Nov 24, 2023
ddc1d52
refactor: apply facade design pattern
Sion99 Nov 24, 2023
985c120
refactor: move validation logic to domain
Sion99 Nov 24, 2023
2c46ffa
fix: add a validation logic
Sion99 Nov 24, 2023
9b84e26
Merge branch 'main' into feat/#58-group-service
Sion99 Nov 24, 2023
e6c367e
refactor: change querydsl projections to QGroupResponseDto constructor
Sion99 Nov 24, 2023
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
package com.uspray.uspray.DTO.group.request;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotNull;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class GroupMemberRequestDto {

@NotNull
private String username;
Sion99 marked this conversation as resolved.
Show resolved Hide resolved
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
package com.uspray.uspray.DTO.group.request;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import javax.validation.constraints.NotBlank;
import javax.validation.constraints.Size;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class GroupRequestDto {

@NotBlank
@Size(min = 1, max = 15, message = "공백 포함 15자 이내로 입력해주세요.")
private String name;
}
dong2ast marked this conversation as resolved.
Show resolved Hide resolved
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
package com.uspray.uspray.DTO.group.response;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class GroupDetailResponseDto {

private Long id;

private String name;

private String description;

private String leader;

private String memberCount;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
package com.uspray.uspray.DTO.group.response;

import lombok.AllArgsConstructor;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.util.List;

@Getter
@NoArgsConstructor
@AllArgsConstructor
public class GroupListResponseDto {

List<GroupResponseDto> groupList;
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
package com.uspray.uspray.DTO.group.response;

import com.uspray.uspray.domain.Group;
import io.swagger.v3.oas.annotations.media.Schema;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

import java.time.LocalDateTime;

@Getter
@NoArgsConstructor
@AllArgsConstructor
@Builder
@Schema(description = "모임 응답 DTO")
public class GroupResponseDto {

private Long id;

private String name;

private String lastPrayContent;

private Integer memberCount;

private Integer prayCount;

private LocalDateTime updatedAt;

}
16 changes: 11 additions & 5 deletions src/main/java/com/uspray/uspray/InitDb.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,8 @@

import com.uspray.uspray.Enums.Authority;
import com.uspray.uspray.Enums.PrayType;
import com.uspray.uspray.domain.Category;
import com.uspray.uspray.domain.History;
import com.uspray.uspray.domain.Member;
import com.uspray.uspray.domain.Pray;
import com.uspray.uspray.domain.*;

import java.time.LocalDate;
import javax.annotation.PostConstruct;
import javax.persistence.EntityManager;
Expand Down Expand Up @@ -45,7 +43,15 @@ public void dbInit() {
.authority(Authority.ROLE_USER)
.build();
em.persist(member);


Group group = Group.builder()
.leader(member)
.name("테스트 모임")
.build();
group.addMember(member);
member.joinGroup(group);
em.persist(group);

Category category = Category.builder()
.name("기타 카테고리")
.color("#FFFFFF")
Expand Down
102 changes: 102 additions & 0 deletions src/main/java/com/uspray/uspray/controller/GroupController.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,102 @@
package com.uspray.uspray.controller;

import com.uspray.uspray.DTO.ApiResponseDto;
import com.uspray.uspray.DTO.group.request.GroupMemberRequestDto;
import com.uspray.uspray.DTO.group.request.GroupRequestDto;
import com.uspray.uspray.DTO.group.response.GroupListResponseDto;
import com.uspray.uspray.exception.SuccessStatus;
import com.uspray.uspray.service.GroupService;
import io.swagger.v3.oas.annotations.Parameter;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import lombok.RequiredArgsConstructor;
import org.springframework.data.repository.query.Param;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.security.core.userdetails.User;
import org.springframework.web.bind.annotation.*;

import javax.validation.Valid;

@RestController
@RequestMapping("/group")
@Tag(name = "Group", description = "모임 API")
@RequiredArgsConstructor
@SecurityRequirement(name = "JWT Auth")
public class GroupController {

private final GroupService groupService;

@GetMapping
public ApiResponseDto<GroupListResponseDto> getGroupList(
@Parameter(hidden = true) @AuthenticationPrincipal User user) {
return ApiResponseDto.success(SuccessStatus.GET_GROUP_LIST_SUCCESS,
groupService.getGroupList(user.getUsername()));
}

@PostMapping
public ApiResponseDto<?> createGroup(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@Valid @RequestBody GroupRequestDto groupRequestDto) {
groupService.createGroup(user.getUsername(), groupRequestDto);
return ApiResponseDto.success(SuccessStatus.CREATE_GROUP_SUCCESS,
SuccessStatus.CREATE_GROUP_SUCCESS.getMessage());
}

@PutMapping("/{groupId}/change-name")
public ApiResponseDto<?> changeGroupName(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId,
@Valid @RequestBody GroupRequestDto groupRequestDto) {
groupService.changeGroupName(user.getUsername(), groupId, groupRequestDto);
return ApiResponseDto.success(SuccessStatus.CHANGE_GROUP_NAME_SUCCESS,
SuccessStatus.CHANGE_GROUP_NAME_SUCCESS.getMessage());
}

@PutMapping("/{groupId}/change-leader")
Sion99 marked this conversation as resolved.
Show resolved Hide resolved
public ApiResponseDto<?> changeGroupLeader(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId,
@Valid @RequestBody GroupMemberRequestDto groupLeaderRequestDto) {
groupService.changeGroupLeader(user.getUsername(), groupId, groupLeaderRequestDto);
return ApiResponseDto.success(SuccessStatus.CHANGE_GROUP_LEADER_SUCCESS,
SuccessStatus.CHANGE_GROUP_LEADER_SUCCESS.getMessage());
}

@DeleteMapping("/{groupId}/kick")
Sion99 marked this conversation as resolved.
Show resolved Hide resolved
public ApiResponseDto<?> kickGroupMember(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId,
@Valid @RequestBody GroupMemberRequestDto groupMemberRequestDto) {
groupService.kickGroupMember(user.getUsername(), groupId, groupMemberRequestDto);
return ApiResponseDto.success(SuccessStatus.KICK_GROUP_MEMBER_SUCCESS,
SuccessStatus.KICK_GROUP_MEMBER_SUCCESS.getMessage());
}

@PostMapping("/{groupId}/member")
public ApiResponseDto<?> addGroupMember(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId,
@Valid @RequestBody GroupMemberRequestDto groupMemberRequestDto) {
groupService.addGroupMember(user.getUsername(), groupId, groupMemberRequestDto);
return ApiResponseDto.success(SuccessStatus.ADD_GROUP_MEMBER_SUCCESS,
SuccessStatus.ADD_GROUP_MEMBER_SUCCESS.getMessage());
}

@DeleteMapping("/{groupId}/leave")
public ApiResponseDto<?> leaveGroup(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId) {
groupService.leaveGroup(user.getUsername(), groupId);
return ApiResponseDto.success(SuccessStatus.LEAVE_GROUP_SUCCESS,
SuccessStatus.LEAVE_GROUP_SUCCESS.getMessage());
}

@DeleteMapping("/{groupId}")
public ApiResponseDto<?> deleteGroup(
@Parameter(hidden = true) @AuthenticationPrincipal User user,
@PathVariable Long groupId) {
groupService.deleteGroup(user.getUsername(), groupId);
return ApiResponseDto.success(SuccessStatus.DELETE_GROUP_SUCCESS,
SuccessStatus.DELETE_GROUP_SUCCESS.getMessage());
}
}
45 changes: 38 additions & 7 deletions src/main/java/com/uspray/uspray/domain/Group.java
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package com.uspray.uspray.domain;

import com.uspray.uspray.common.domain.AuditingTimeEntity;

import java.util.HashSet;
import java.util.List;
import javax.persistence.Column;
import javax.persistence.Entity;
import javax.persistence.GeneratedValue;
import javax.persistence.GenerationType;
import javax.persistence.Id;
import javax.persistence.OneToMany;
import javax.persistence.Table;
import java.util.Set;
import javax.persistence.*;

import lombok.AccessLevel;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;

Expand All @@ -24,7 +23,39 @@ public class Group extends AuditingTimeEntity {
@Column(name = "group_id")
private Long id;

private String name;

@OneToOne
@JoinColumn(name = "leader_id", referencedColumnName = "member_id")
private Member leader;

@ManyToMany(mappedBy = "groups")
private Set<Member> members = new HashSet<>();
Sion99 marked this conversation as resolved.
Show resolved Hide resolved

@OneToMany(mappedBy = "group", orphanRemoval = true)
private List<GroupPray> groupPrayList;

@Builder
public Group(String name, Member leader) {
this.name = name;
this.members.add(leader);
this.leader = leader;
}

public void changeName(String name) {
this.name = name;
}

public void changeLeader(Member leader) {
this.leader = leader;
}

public void addMember(Member member) {
this.members.add(member);
}

public void kickMember(Member member) {
this.members.remove(member);
}

}
Loading