Skip to content

Commit 4ebaf71

Browse files
authored
Merge pull request #338 from MT-TEAM-Org/revert-332-epic/adminMeberResearch
병합 진행후에 qclass가 생성되지않는 문제를 발견하였습니다. 취소후에 검토후 다시 병합하겠습니다.
2 parents f50d7af + 9304f71 commit 4ebaf71

25 files changed

+28
-1253
lines changed

build.gradle

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,12 +112,10 @@ dependencies {
112112
implementation 'org.springframework.boot:spring-boot-starter-actuator'
113113

114114

115-
116115
//query dsl에서는 union연산같은걸 지원하지않아서 넣었습니다.
117116
implementation("com.blazebit:blaze-persistence-integration-querydsl-expressions-jakarta:1.6.15")
118117
implementation("com.blazebit:blaze-persistence-integration-hibernate-6.2:1.6.15")
119118
implementation("com.blazebit:blaze-persistence-core-impl-jakarta:1.6.15")
120-
121119
}
122120

123121
test {

src/main/java/org/myteam/server/admin/dto/BoardCountCte.java

Lines changed: 0 additions & 18 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/dto/CommentCountCte.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/dto/MemberReportCte.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
import lombok.Getter;
1010
import org.myteam.server.report.domain.ReportType;
1111

12-
1312
@Entity
1413
@Getter
1514
@CTE
@@ -19,5 +18,5 @@ public class MemberReportCte {
1918
private Long reportedId;
2019
@Enumerated(EnumType.STRING)
2120
private ReportType reportType;
22-
private Long reportCount;
21+
2322
}

src/main/java/org/myteam/server/admin/dto/MemberSearchRequestDto.java

Lines changed: 0 additions & 107 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/dto/MemberSearchResponseDto.java

Lines changed: 0 additions & 133 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/dto/ReportCountCte.java

Lines changed: 0 additions & 19 deletions
This file was deleted.

src/main/java/org/myteam/server/admin/entity/AdminChangeLog.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.myteam.server.admin.entity;
22

3-
43
import jakarta.persistence.*;
54
import lombok.Builder;
65
import lombok.Getter;

src/main/java/org/myteam/server/admin/entity/AdminMemo.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package org.myteam.server.admin.entity;
22

3-
43
import jakarta.persistence.*;
54
import lombok.Builder;
65
import lombok.Getter;

src/main/java/org/myteam/server/admin/repository/AdminChangeLogRepo.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,6 @@
44
import org.springframework.data.jpa.repository.JpaRepository;
55

66

7+
78
public interface AdminChangeLogRepo extends JpaRepository<AdminChangeLog, Long> {
89
}

0 commit comments

Comments
 (0)