Skip to content

Commit

Permalink
Merge pull request #74 from KNU-HAEDAL/package
Browse files Browse the repository at this point in the history 
Package
  • Loading branch information
@bayy1216
bayy1216 authored Sep 3, 2024
2 parents 051c07e + 9c6d0ed commit 06a4e9c
Show file tree
Hide file tree
Showing 108 changed files with 363 additions and 382 deletions.
10 changes: 4 additions & 6 deletions ...uni/controller/admin/AdminController.java → ...uni/admin/controller/AdminController.java
View file
Original file line number Diff line number Diff line change
@@ -1,15 +1,14 @@
package org.haedal.zzansuni.controller.admin;
package org.haedal.zzansuni.admin.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.controller.auth.AuthReq;
import org.haedal.zzansuni.auth.controller.AuthReq;
import org.haedal.zzansuni.auth.domain.AuthService;
import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupService;
import org.haedal.zzansuni.core.api.ApiResponse;
import org.haedal.zzansuni.domain.auth.AuthService;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupService;
import org.springframework.http.HttpStatus;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.web.bind.annotation.*;

@Tag(name = "admin", description = "관리자 API")
Expand All @@ -19,7 +18,6 @@ public class AdminController {

private final AuthService authService;
private final ChallengeGroupService challengeGroupService;
private final BCryptPasswordEncoder passwordEncoder;

@ResponseStatus(HttpStatus.CREATED)
@Operation(summary = "매니저 등록", description = "매니저를 등록한다.")
Expand Down
8 changes: 4 additions & 4 deletions ...l/zzansuni/controller/admin/AdminReq.java → ...l/zzansuni/admin/controller/AdminReq.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.haedal.zzansuni.controller.admin;
package org.haedal.zzansuni.admin.controller;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupCommand;
import org.haedal.zzansuni.domain.challengegroup.DayType;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupCommand;
import org.haedal.zzansuni.challengegroup.domain.DayType;

import java.time.LocalDate;
import java.util.List;
Expand Down
6 changes: 3 additions & 3 deletions ...nsuni/controller/auth/AuthController.java → ...nsuni/auth/controller/AuthController.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.haedal.zzansuni.controller.auth;
package org.haedal.zzansuni.auth.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.core.api.ApiResponse;
import org.haedal.zzansuni.domain.auth.AuthService;
import org.haedal.zzansuni.domain.user.UserModel;
import org.haedal.zzansuni.auth.domain.AuthService;
import org.haedal.zzansuni.user.domain.UserModel;
import org.haedal.zzansuni.global.jwt.JwtToken;
import org.springframework.data.util.Pair;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
Expand Down
6 changes: 3 additions & 3 deletions ...dal/zzansuni/controller/auth/AuthReq.java → ...dal/zzansuni/auth/controller/AuthReq.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.haedal.zzansuni.controller.auth;
package org.haedal.zzansuni.auth.controller;

import io.swagger.v3.oas.annotations.media.Schema;
import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import org.haedal.zzansuni.domain.auth.OAuth2Provider;
import org.haedal.zzansuni.domain.user.UserCommand;
import org.haedal.zzansuni.auth.domain.OAuth2Provider;
import org.haedal.zzansuni.user.domain.UserCommand;

public class AuthReq {
public record OAuth2LoginRequest(
Expand Down
6 changes: 3 additions & 3 deletions ...dal/zzansuni/controller/auth/AuthRes.java → ...dal/zzansuni/auth/controller/AuthRes.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.haedal.zzansuni.controller.auth;
package org.haedal.zzansuni.auth.controller;

import lombok.Builder;
import org.haedal.zzansuni.controller.user.UserRes;
import org.haedal.zzansuni.domain.user.UserModel;
import org.haedal.zzansuni.user.controller.UserRes;
import org.haedal.zzansuni.user.domain.UserModel;
import org.haedal.zzansuni.global.jwt.JwtToken;

public class AuthRes {
Expand Down
4 changes: 2 additions & 2 deletions ...dal/zzansuni/domain/auth/AuthService.java → ...dal/zzansuni/auth/domain/AuthService.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.haedal.zzansuni.domain.auth;
package org.haedal.zzansuni.auth.domain;

import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.domain.user.*;
import org.haedal.zzansuni.global.jwt.JwtToken;
import org.haedal.zzansuni.global.jwt.JwtUser;
import org.haedal.zzansuni.global.jwt.JwtUtils;
import org.haedal.zzansuni.user.domain.*;
import org.springframework.data.util.Pair;
import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion ...al/zzansuni/domain/auth/OAuth2Client.java → ...al/zzansuni/auth/domain/OAuth2Client.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.auth;
package org.haedal.zzansuni.auth.domain;

import org.springframework.lang.NonNull;
import org.springframework.lang.Nullable;
Expand Down
2 changes: 1 addition & 1 deletion .../zzansuni/domain/auth/OAuth2Provider.java → .../zzansuni/auth/domain/OAuth2Provider.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.auth;
package org.haedal.zzansuni.auth.domain;

public enum OAuth2Provider {
KAKAO,
Expand Down
4 changes: 2 additions & 2 deletions ...nsuni/domain/auth/OAuthUserInfoModel.java → ...nsuni/auth/domain/OAuthUserInfoModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package org.haedal.zzansuni.domain.auth;
package org.haedal.zzansuni.auth.domain;

import lombok.Builder;
import org.haedal.zzansuni.domain.user.UserCommand;
import org.haedal.zzansuni.user.domain.UserCommand;

@Builder
public record OAuthUserInfoModel(
Expand Down
4 changes: 2 additions & 2 deletions ...frastructure/auth/AuthTokenGenerator.java → ...th/infrastructure/AuthTokenGenerator.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

import org.haedal.zzansuni.domain.auth.OAuth2Provider;
import org.haedal.zzansuni.auth.domain.OAuth2Provider;
import org.springframework.stereotype.Component;

/**
Expand Down
8 changes: 4 additions & 4 deletions ...nfrastructure/auth/KakaoOAuth2Client.java → ...uth/infrastructure/KakaoOAuth2Client.java
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

import org.haedal.zzansuni.domain.auth.OAuth2Client;
import org.haedal.zzansuni.domain.auth.OAuth2Provider;
import org.haedal.zzansuni.domain.auth.OAuthUserInfoModel;
import org.haedal.zzansuni.auth.domain.OAuth2Client;
import org.haedal.zzansuni.auth.domain.OAuth2Provider;
import org.haedal.zzansuni.auth.domain.OAuthUserInfoModel;
import org.haedal.zzansuni.global.exception.ExternalServerConnectionException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
Expand Down
2 changes: 1 addition & 1 deletion ...frastructure/auth/KakaoTokenResponse.java → ...th/infrastructure/KakaoTokenResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
2 changes: 1 addition & 1 deletion ...structure/auth/KakaoUserInfoResponse.java → ...infrastructure/KakaoUserInfoResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
8 changes: 4 additions & 4 deletions ...nfrastructure/auth/NaverOAuth2Client.java → ...uth/infrastructure/NaverOAuth2Client.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;


import org.haedal.zzansuni.domain.auth.OAuth2Client;
import org.haedal.zzansuni.domain.auth.OAuth2Provider;
import org.haedal.zzansuni.domain.auth.OAuthUserInfoModel;
import org.haedal.zzansuni.auth.domain.OAuth2Client;
import org.haedal.zzansuni.auth.domain.OAuth2Provider;
import org.haedal.zzansuni.auth.domain.OAuthUserInfoModel;
import org.haedal.zzansuni.global.exception.ExternalServerConnectionException;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Profile;
Expand Down
2 changes: 1 addition & 1 deletion ...frastructure/auth/NaverTokenResponse.java → ...th/infrastructure/NaverTokenResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

import com.fasterxml.jackson.annotation.JsonProperty;

Expand Down
2 changes: 1 addition & 1 deletion ...structure/auth/NaverUserInfoResponse.java → ...infrastructure/NaverUserInfoResponse.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.infrastructure.auth;
package org.haedal.zzansuni.auth.infrastructure;

public record NaverUserInfoResponse(
String resultcode,
Expand Down
14 changes: 7 additions & 7 deletions ...llengegroup/ChallengeGroupController.java → .../controller/ChallengeGroupController.java
View file
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
package org.haedal.zzansuni.controller.challengegroup;
package org.haedal.zzansuni.challengegroup.controller;

import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.controller.PagingRequest;
import org.haedal.zzansuni.controller.PagingResponse;
import org.haedal.zzansuni.common.controller.PagingRequest;
import org.haedal.zzansuni.common.controller.PagingResponse;
import org.haedal.zzansuni.core.api.ApiResponse;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupQueryService;
import org.haedal.zzansuni.domain.userchallenge.application.ChallengeRankingService;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupModel;
import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupQueryService;
import org.haedal.zzansuni.userchallenge.domain.application.ChallengeRankingService;
import org.haedal.zzansuni.global.jwt.JwtUser;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.web.bind.annotation.GetMapping;
Expand Down
5 changes: 5 additions & 0 deletions ...er/app/src/main/java/org/haedal/zzansuni/challengegroup/controller/ChallengeGroupReq.java
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package org.haedal.zzansuni.challengegroup.controller;

public class ChallengeGroupReq {

}
14 changes: 7 additions & 7 deletions ...ler/challengegroup/ChallengeGroupRes.java → ...gegroup/controller/ChallengeGroupRes.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.haedal.zzansuni.controller.challengegroup;
package org.haedal.zzansuni.challengegroup.controller;

import lombok.Builder;
import org.haedal.zzansuni.controller.user.UserRes;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel;
import org.haedal.zzansuni.domain.challengegroup.DayType;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeModel;
import org.haedal.zzansuni.domain.userchallenge.application.ChallengeGroupRankingModel;
import org.haedal.zzansuni.user.controller.UserRes;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.application.ChallengeGroupModel;
import org.haedal.zzansuni.challengegroup.domain.DayType;
import org.haedal.zzansuni.challengegroup.domain.application.ChallengeModel;
import org.haedal.zzansuni.userchallenge.domain.application.ChallengeGroupRankingModel;
import org.springframework.data.domain.Page;

import java.time.LocalDate;
Expand Down
4 changes: 2 additions & 2 deletions ...suni/domain/challengegroup/Challenge.java → ...suni/challengegroup/domain/Challenge.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import jakarta.persistence.*;

Expand All @@ -8,7 +8,7 @@
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.haedal.zzansuni.domain.BaseTimeEntity;
import org.haedal.zzansuni.common.domain.BaseTimeEntity;

@Entity
@AllArgsConstructor
Expand Down
2 changes: 1 addition & 1 deletion ...ain/challengegroup/ChallengeCategory.java → ...llengegroup/domain/ChallengeCategory.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import lombok.RequiredArgsConstructor;

Expand Down
2 changes: 1 addition & 1 deletion ...main/challengegroup/ChallengeCommand.java → ...allengegroup/domain/ChallengeCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import jakarta.validation.constraints.Max;
import jakarta.validation.constraints.Min;
Expand Down
4 changes: 2 additions & 2 deletions ...domain/challengegroup/ChallengeGroup.java → ...challengegroup/domain/ChallengeGroup.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.haedal.zzansuni.domain.BaseTimeEntity;
import org.haedal.zzansuni.common.domain.BaseTimeEntity;

import java.util.ArrayList;
import java.util.List;
Expand Down
4 changes: 1 addition & 3 deletions ...challengegroup/ChallengeGroupCommand.java → ...gegroup/domain/ChallengeGroupCommand.java
View file
Original file line number Diff line number Diff line change
@@ -1,12 +1,10 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import jakarta.validation.constraints.NotBlank;
import jakarta.validation.constraints.NotNull;
import lombok.Builder;
import lombok.Getter;
import org.haedal.zzansuni.core.utils.SelfValidating;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.DayType;

import java.time.LocalDate;
import java.util.List;
Expand Down
5 changes: 2 additions & 3 deletions ...n/challengegroup/ChallengeGroupImage.java → ...engegroup/domain/ChallengeGroupImage.java
View file
Original file line number Diff line number Diff line change
@@ -1,13 +1,12 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

import jakarta.persistence.*;
import lombok.AccessLevel;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Getter;
import lombok.NoArgsConstructor;
import org.haedal.zzansuni.domain.BaseTimeEntity;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup;
import org.haedal.zzansuni.common.domain.BaseTimeEntity;

@Entity
@NoArgsConstructor(access = AccessLevel.PROTECTED)
Expand Down
2 changes: 1 addition & 1 deletion ...ansuni/domain/challengegroup/DayType.java → ...ansuni/challengegroup/domain/DayType.java
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package org.haedal.zzansuni.domain.challengegroup;
package org.haedal.zzansuni.challengegroup.domain;

public enum DayType {
DAY, WEEK, MONTH, YEAR
Expand Down
8 changes: 4 additions & 4 deletions ...roup/application/ChallengeGroupModel.java → ...main/application/ChallengeGroupModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.haedal.zzansuni.domain.challengegroup.application;
package org.haedal.zzansuni.challengegroup.domain.application;

import lombok.Builder;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage;

import java.time.LocalDate;
import java.util.List;
Expand Down
12 changes: 6 additions & 6 deletions ...plication/ChallengeGroupQueryService.java → ...plication/ChallengeGroupQueryService.java
View file
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package org.haedal.zzansuni.domain.challengegroup.application;
package org.haedal.zzansuni.challengegroup.domain.application;

import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage;
import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupImageReader;
import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage;
import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupImageReader;
import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
Expand Down
10 changes: 5 additions & 5 deletions ...up/application/ChallengeGroupService.java → ...in/application/ChallengeGroupService.java
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package org.haedal.zzansuni.domain.challengegroup.application;
package org.haedal.zzansuni.challengegroup.domain.application;

import lombok.RequiredArgsConstructor;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupCommand;
import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupReader;
import org.haedal.zzansuni.domain.challengegroup.port.ChallengeGroupStore;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupCommand;
import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupReader;
import org.haedal.zzansuni.challengegroup.domain.port.ChallengeGroupStore;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

Expand Down
6 changes: 3 additions & 3 deletions ...engegroup/application/ChallengeModel.java → ...up/domain/application/ChallengeModel.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.haedal.zzansuni.domain.challengegroup.application;
package org.haedal.zzansuni.challengegroup.domain.application;

import lombok.Builder;
import lombok.Getter;
import org.haedal.zzansuni.domain.challengegroup.Challenge;
import org.haedal.zzansuni.domain.challengegroup.DayType;
import org.haedal.zzansuni.challengegroup.domain.Challenge;
import org.haedal.zzansuni.challengegroup.domain.DayType;

import java.time.LocalDate;

Expand Down
4 changes: 2 additions & 2 deletions ...group/port/ChallengeGroupImageReader.java → ...omain/port/ChallengeGroupImageReader.java
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package org.haedal.zzansuni.domain.challengegroup.port;
package org.haedal.zzansuni.challengegroup.domain.port;

import org.haedal.zzansuni.domain.challengegroup.ChallengeGroupImage;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroupImage;

import java.util.List;

Expand Down
9 changes: 4 additions & 5 deletions ...lengegroup/port/ChallengeGroupReader.java → ...oup/domain/port/ChallengeGroupReader.java
View file
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
package org.haedal.zzansuni.domain.challengegroup.port;
package org.haedal.zzansuni.challengegroup.domain.port;

import org.haedal.zzansuni.domain.challengegroup.ChallengeCategory;
import org.haedal.zzansuni.domain.challengegroup.ChallengeGroup;
import org.haedal.zzansuni.domain.challengegroup.application.ChallengeGroupModel;
import org.haedal.zzansuni.domain.userchallenge.application.ChallengeGroupRankingModel;
import org.haedal.zzansuni.challengegroup.domain.ChallengeCategory;
import org.haedal.zzansuni.challengegroup.domain.ChallengeGroup;
import org.haedal.zzansuni.userchallenge.domain.application.ChallengeGroupRankingModel;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

Expand Down
Loading

0 comments on commit 06a4e9c

Please sign in to comment.