[EA3-115] chore: develop → main 브랜치 머지

.github/ISSUE_TEMPLATE/✨-feature-template.md

@@ -0,0 +1,14 @@
+---
+name: "✨ feature-template"
+about: 새로운 기능을 추가하거나 기존 기능을 개선할 때 사용해주세요
+title: ''
+labels: "✨ feature"
+assignees: ''
+
+---
+
+## 📝 설명 <!-- 어떤 걸 구현 예정인지 대략적으로 설명해주세요 -->
+
+
+## ✅ 구현 목록 <!-- 해야 할 일들을 적어주세요 -->
+- [ ]

.github/ISSUE_TEMPLATE/🐛-fix-template.md

@@ -0,0 +1,21 @@
+---
+name: "\U0001F41B fix-template"
+about: 버그 발생 시 사용해주세요
+title: ''
+labels: "\U0001F41B fix"
+assignees: ''
+
+---
+
+🐛 버그 설명 <!-- 어떤 버그인지 간결하게 설명해주세요 -->
+
+🚨 버그 발생 상황 <!-- 어떤 상황에서 발생한 버그인지 설명해주세요 -->
+<!-- (가능하면) Given-When-Then 형식으로 서술해주세요 -->
+
+💡 예상 결과 <!-- 예상했던 정상적인 결과가 어떤 것이었는지 설명해주세요 -->
+
+🚩 실제 동작 <!-- 현재 어떻게 동작하는지 설명해주세요 -->
+
+🛠️ 가능한 해결 방법 <!-- 문제를 해결하기 위한 아이디어가 있다면 간단히 작성해주세요 -->
+
+📎 추가 정보 <!-- 문제와 관련된 스크린샷이나 에러 로그 또는 기타 참고 자료를 첨부해주세요 -->

.github/workflows/create-jira-issue.yml

@@ -78,10 +78,10 @@ jobs:
       - name: Log created issue
         run: echo "Jira Issue ${{ steps.issue-parser.outputs.parentKey }}/${{ steps.create.outputs.issue }} was created"
 
-      - name: Checkout main code
+      - name: Checkout develop code
         uses: actions/checkout@v4
         with:
-          ref: main
+          ref: develop
 
       - name: Convert label-selection to Capitalized TYPE
         run: |

.gitignore

@@ -1,4 +1,5 @@
 # === Gradle ===
+src/main/generated/**
 .gradle
 build/
 !gradle/wrapper/gradle-wrapper.jar

build.gradle

@@ -21,58 +21,76 @@ ext {
 
 repositories {
 	mavenCentral()
+	google()
 }
 
 dependencies {
 	// 데이터 베이스 의존성
-//	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
-//	runtimeOnly 'com.h2database:h2'
-//	runtimeOnly 'org.postgresql:postgresql'
+	implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
+	runtimeOnly 'com.mysql:mysql-connector-j:8.4.0'
+	//implementation 'com.h2database:h2:2.3.232'
+	//implementation 'org.springframework.boot:spring-boot-devtools'
 
 	// Sql 쿼리 파라미터 보는 라이브러리
-//	implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
+    implementation 'com.github.gavlyukovskiy:p6spy-spring-boot-starter:1.9.0'
 
-	// 테스트 데이터베이스 의존성
-//	testImplementation 'com.h2database:h2:1.4.200'
+    // 테스트 데이터베이스 의존성
+	testImplementation 'com.h2database:h2:1.4.200'
 
-	//Querydsl 추가
-//	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
-//	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
-//	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
-//	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
-//
-//	testImplementation 'org.springframework.boot:spring-boot-starter-test'
-//	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+	// Querydsl 추가
+	implementation 'com.querydsl:querydsl-jpa:5.0.0:jakarta'
+	annotationProcessor "com.querydsl:querydsl-apt:${dependencyManagement.importedProperties['querydsl.version']}:jakarta"
+	annotationProcessor "jakarta.annotation:jakarta.annotation-api"
+	annotationProcessor "jakarta.persistence:jakarta.persistence-api"
+
+	testImplementation 'org.springframework.boot:spring-boot-starter-test'
+	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
 
 	// 테스트 의존성
 	testImplementation 'org.springframework.boot:spring-boot-starter-test'
 	testImplementation 'org.springframework.security:spring-security-test'
 	testRuntimeOnly 'org.junit.platform:junit-platform-launcher'
+
+	// 롬복
+	compileOnly 'org.projectlombok:lombok:1.18.30'
 	annotationProcessor 'org.projectlombok:lombok'
 
 	// 웹 관련 의존성
 	implementation 'org.springframework.boot:spring-boot-starter-web'
 	implementation 'org.springframework.boot:spring-boot-starter-validation'
 
+	// lombok 의존성
+	implementation "org.projectlombok:lombok:1.18.38"
+
 	// 시큐리티 의존성
-//	implementation 'org.springframework.boot:spring-boot-starter-security'
+	implementation 'org.springframework.boot:spring-boot-starter-security'
+
+	// Redis DB Cloud 의존성
+	implementation 'org.springframework.boot:spring-boot-starter-data-redis'
+	implementation 'org.springframework.session:spring-session-data-redis'
 
 	//JWT 의존성
 	implementation 'io.jsonwebtoken:jjwt-api:0.12.3'
 	implementation 'io.jsonwebtoken:jjwt-impl:0.12.3'
 	implementation 'io.jsonwebtoken:jjwt-jackson:0.12.3'
 
+	// OAuth2 의존성
+	implementation 'org.springframework.boot:spring-boot-starter-oauth2-client'
+
 	// GCP 관련 의존성
-	implementation 'com.google.cloud:spring-cloud-gcp-starter-secretmanager'
-	implementation 'com.google.cloud:google-cloud-storage'
+	// implementation 'com.google.cloud:spring-cloud-gcp-starter-secretmanager:4.9.1'
+	// implementation 'com.google.cloud:google-cloud-storage:2.38.0'
+
+	// swagger
+	implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.7.0'
 }
 
 dependencyManagement {
 	imports {
 		// Spring Cloud 전반 (Feign, Gateway 등) 의존성 버전 관리
-		mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
+		// mavenBom "org.springframework.cloud:spring-cloud-dependencies:${springCloudVersion}"
 		// GCP 관련 스타터(BOM) 관리 - Secret Manager, GCS 등
-		mavenBom "com.google.cloud:spring-cloud-gcp-dependencies:${springCloudGcpVersion}"
+		// mavenBom "com.google.cloud:spring-cloud-gcp-dependencies:${springCloudGcpVersion}"
 	}
 }
 
@@ -83,15 +101,15 @@ tasks.named('test') {
 // 환경별 application.properties 포함/제외 설정
 def activeProfile = project.hasProperty("profile") ? project.getProperty("profile") : "local"
 
-processResources {
-	filesMatching("**/application.properties") {
-		expand(profile: activeProfile)
-	}
-
-	// 환경에 따라 불필요한 설정 파일 제외
-	if (activeProfile == "local") {
-		exclude("application-prod.properties")
-	} else if (activeProfile == "prod") {
-		exclude("application-local.properties")
-	}
-}
+//processResources {
+//	filesMatching("**/application.properties") {
+//		expand(profile: activeProfile)
+//	}
+//
+//	// 환경에 따라 불필요한 설정 파일 제외
+//	if (activeProfile == "local") {
+//		exclude("application-prod.properties")
+//	} else if (activeProfile == "prod") {
+//		exclude("application-local.properties")
+//	}
+//}

src/main/java/grep/neogul_coder/NeogulCoderApplication.java

@@ -1,7 +1,8 @@
 package grep.neogul_coder;
 
 import java.util.TimeZone;
-import javax.annotation.PostConstruct;
+
+import jakarta.annotation.PostConstruct;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 

src/main/java/grep/neogul_coder/domain/attendance/Attendance.java

@@ -0,0 +1,23 @@
+package grep.neogul_coder.domain.attendance;
+
+import grep.neogul_coder.global.entity.BaseEntity;
+import jakarta.persistence.*;
+
+import java.time.LocalDate;
+
+@Entity
+public class Attendance extends BaseEntity {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long attendanceId;
+
+    @Column(nullable = false)
+    private Long studyId;
+
+    @Column(nullable = false)
+    private Long userId;
+
+    @Column(nullable = false)
+    private LocalDate attendanceDate;
+}

src/main/java/grep/neogul_coder/domain/attendance/controller/AttendanceController.java

@@ -0,0 +1,25 @@
+package grep.neogul_coder.domain.attendance.controller;
+
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceResponse;
+import grep.neogul_coder.global.response.ApiResponse;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RequestMapping("/api/attendances")
+@RestController
+public class AttendanceController implements AttendanceSpecification {
+
+    @GetMapping
+    public ApiResponse<List<AttendanceResponse>> getAttendances() {
+        return ApiResponse.success(List.of(new AttendanceResponse()));
+    }
+
+    @PostMapping
+    public ApiResponse<Void> createAttendance() {
+        return ApiResponse.noContent();
+    }
+}

src/main/java/grep/neogul_coder/domain/attendance/controller/AttendanceSpecification.java

@@ -0,0 +1,18 @@
+package grep.neogul_coder.domain.attendance.controller;
+
+import grep.neogul_coder.domain.attendance.controller.dto.response.AttendanceResponse;
+import grep.neogul_coder.global.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.tags.Tag;
+
+import java.util.List;
+
+@Tag(name = "Attendance", description = "출석 API")
+public interface AttendanceSpecification {
+
+    @Operation(summary = "출석 조회", description = "일주일 단위로 출석을 조회합니다.")
+    ApiResponse<List<AttendanceResponse>> getAttendances();
+
+    @Operation(summary = "출석 체크", description = "스터디에 출석을 합니다.")
+    ApiResponse<Void> createAttendance();
+}

src/main/java/grep/neogul_coder/domain/attendance/controller/dto/response/AttendanceResponse.java

@@ -0,0 +1,19 @@
+package grep.neogul_coder.domain.attendance.controller.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Getter;
+
+import java.time.LocalDate;
+
+@Getter
+public class AttendanceResponse {
+
+    @Schema(description = "스터디 Id", example = "1")
+    private Long studyId;
+
+    @Schema(description = "유저 Id", example = "2")
+    private Long userId;
+
+    @Schema(description = "출석일", example = "2025-07-10")
+    private LocalDate attendanceDate;
+}

src/main/java/grep/neogul_coder/domain/buddy/controller/BuddyEnergyController.java

@@ -0,0 +1,15 @@
+package grep.neogul_coder.domain.buddy.controller;
+
+import grep.neogul_coder.domain.buddy.controller.dto.response.BuddyEnergyResponse;
+import grep.neogul_coder.global.response.ApiResponse;
+import org.springframework.web.bind.annotation.*;
+
+@RestController
+@RequestMapping("/api/buddy-energy")
+public class BuddyEnergyController implements BuddyEnergySpecification {
+
+    @GetMapping("/{userId}")
+    public ApiResponse<BuddyEnergyResponse> get(@PathVariable("userId") Long userId) {
+        return ApiResponse.success(new BuddyEnergyResponse());
+    }
+}

src/main/java/grep/neogul_coder/domain/buddy/controller/BuddyEnergySpecification.java

@@ -0,0 +1,13 @@
+package grep.neogul_coder.domain.buddy.controller;
+
+import grep.neogul_coder.domain.buddy.controller.dto.response.BuddyEnergyResponse;
+import grep.neogul_coder.global.response.ApiResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import org.springframework.web.bind.annotation.PathVariable;
+
+public interface BuddyEnergySpecification {
+
+    @Operation(summary = "버디 에너지 조회", description = "특정 사용자의 버디 에너지를 조회합니다")
+    ApiResponse<BuddyEnergyResponse> get(@PathVariable Long userId);
+
+}

src/main/java/grep/neogul_coder/domain/buddy/controller/dto/response/BuddyEnergyResponse.java

@@ -0,0 +1,18 @@
+package grep.neogul_coder.domain.buddy.controller.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Schema(description = "버디 에너지 응답 dto")
+public class BuddyEnergyResponse {
+
+    @Schema(description = "회원 ID", example = "1")
+    private Long userId;
+
+    @Schema(description = "현재 버디에너지 수치", example = "61")
+    private int level;
+
+
+}

src/main/java/grep/neogul_coder/domain/buddy/entity/BuddyEnergy.java

@@ -0,0 +1,25 @@
+package grep.neogul_coder.domain.buddy.entity;
+
+import grep.neogul_coder.domain.users.entity.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+@Entity
+public class BuddyEnergy {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long buddyEnergyId;
+
+    @Column(name = "user_id", nullable = false)
+    private Long userId;
+
+    @Column(nullable = false)
+    private int level;
+}

src/main/java/grep/neogul_coder/domain/buddy/entity/BuddyLog.java

@@ -0,0 +1,29 @@
+package grep.neogul_coder.domain.buddy.entity;
+
+import grep.neogul_coder.domain.buddy.enums.BuddyEnergyReason;
+import grep.neogul_coder.domain.users.entity.User;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
+import jakarta.persistence.Enumerated;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
+
+@Entity
+public class BuddyLog {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.IDENTITY)
+    private Long buddyLogId;
+
+    @Enumerated(EnumType.STRING)
+    private BuddyEnergyReason reason;
+
+    @ManyToOne(fetch = FetchType.LAZY)
+    private BuddyEnergy buddyEnergy;
+
+}