-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'dev' into 909-feature-ticket-apoorve-api
- Loading branch information
Showing
74 changed files
with
2,301 additions
and
852 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
17 changes: 17 additions & 0 deletions
17
gg-admin-repo/src/main/java/gg/admin/repo/agenda/AgendaProfileAdminRepository.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,17 @@ | ||
package gg.admin.repo.agenda; | ||
|
||
import java.util.Optional; | ||
|
||
import org.springframework.data.jpa.repository.JpaRepository; | ||
import org.springframework.data.jpa.repository.Query; | ||
import org.springframework.stereotype.Repository; | ||
|
||
import gg.data.agenda.AgendaProfile; | ||
|
||
@Repository | ||
public interface AgendaProfileAdminRepository extends JpaRepository<AgendaProfile, Long> { | ||
|
||
|
||
@Query("SELECT a FROM AgendaProfile a WHERE a.intraId = :intraId") | ||
Optional<AgendaProfile> findByIntraId(String intraId); | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
21 changes: 21 additions & 0 deletions
21
...src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamMateReqDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
package gg.agenda.api.admin.agendateam.controller.request; | ||
|
||
import javax.validation.constraints.NotNull; | ||
|
||
import lombok.AccessLevel; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public class AgendaTeamMateReqDto { | ||
|
||
@NotNull | ||
private String intraId; | ||
|
||
@Builder | ||
public AgendaTeamMateReqDto(String intraId) { | ||
this.intraId = intraId; | ||
} | ||
} |
68 changes: 68 additions & 0 deletions
68
.../src/main/java/gg/agenda/api/admin/agendateam/controller/request/AgendaTeamUpdateDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,68 @@ | ||
package gg.agenda.api.admin.agendateam.controller.request; | ||
|
||
import java.util.List; | ||
import java.util.UUID; | ||
|
||
import javax.validation.Valid; | ||
import javax.validation.constraints.Max; | ||
import javax.validation.constraints.Min; | ||
import javax.validation.constraints.NotBlank; | ||
import javax.validation.constraints.NotNull; | ||
import javax.validation.constraints.Size; | ||
|
||
import gg.data.agenda.type.AgendaTeamStatus; | ||
import gg.data.agenda.type.Location; | ||
import lombok.AccessLevel; | ||
import lombok.Builder; | ||
import lombok.Getter; | ||
import lombok.NoArgsConstructor; | ||
|
||
@Getter | ||
@NoArgsConstructor(access = AccessLevel.PROTECTED) | ||
public class AgendaTeamUpdateDto { | ||
|
||
@NotNull | ||
private UUID teamKey; | ||
|
||
@NotBlank | ||
@Size(max = 30) | ||
private String teamName; | ||
|
||
@NotBlank | ||
private String teamContent; | ||
|
||
@NotNull | ||
private AgendaTeamStatus teamStatus; | ||
|
||
@NotNull | ||
private Boolean teamIsPrivate; | ||
|
||
@NotNull | ||
private Location teamLocation; | ||
|
||
@NotNull | ||
private String teamAward; | ||
|
||
@Min(1) | ||
@Max(1000) | ||
private Integer teamAwardPriority; | ||
|
||
@Valid | ||
@NotNull | ||
private List<AgendaTeamMateReqDto> teamMates; | ||
|
||
@Builder | ||
public AgendaTeamUpdateDto(UUID teamKey, String teamName, String teamContent, AgendaTeamStatus teamStatus, | ||
Location teamLocation, String teamAward, Integer teamAwardPriority, Boolean teamIsPrivate, | ||
List<AgendaTeamMateReqDto> teamMates) { | ||
this.teamKey = teamKey; | ||
this.teamName = teamName; | ||
this.teamContent = teamContent; | ||
this.teamStatus = teamStatus; | ||
this.teamAward = teamAward; | ||
this.teamAwardPriority = teamAwardPriority; | ||
this.teamIsPrivate = teamIsPrivate; | ||
this.teamLocation = teamLocation; | ||
this.teamMates = teamMates; | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.