Skip to content

3차 배포 #273

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.

Sign up for GitHub

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

Merged
hey-sung merged 2 commits into from
Mar 30, 2025
Merged

3차 배포 #273

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7346234
[REFACTOR]CertificationRepository 쿼리 성능 개선 (#272)
hey-sung Mar 30, 2025
f9e82b1
chore: 워크플로우 업데이트
hey-sung Mar 30, 2025
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
30 changes: 13 additions & 17 deletions .github/workflows/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,23 +29,19 @@ jobs:

- name: make application.yml
run: |
mkdir -p ./src/main/resources
cd ./src/main/resources
touch ./application.yml
touch ./application-common.yml
touch ./application-prod.yml
echo "${{ secrets.APPLICATION }}" > ./application.yml
echo "${{ secrets.COMMON }}" > ./application-common.yml
echo "${{ secrets.PROD }}" > ./application-prod.yml

- name: make test application.yml
run: |
mkdir -p ./src/test/resources
cd ./src/test/resources
touch ./application.yml
touch ./application-test.yml
echo "${{ secrets.APPLICATION_TEST }}" > ./application.yml
echo "${{ secrets.TEST }}" > ./application-test.yml
mkdir -p src/main/resources
cp GitGet-BACK-SECRET/main/resources/application.yml src/main/resources/
cp GitGet-BACK-SECRET/main/resources/application-prod.yml src/main/resources/
cp GitGet-BACK-SECRET/main/resources/application-common.yml src/main/resources/

mkdir -p src/test/resources
cp GitGet-BACK-SECRET/test/resources/application.yml src/test/resources/
cp GitGet-BACK-SECRET/test/resources/application-test.yml src/test/resources/

echo "Main resources contents:"
ls -la src/main/resources/
echo "Test resources contents:"
ls -la src/test/resources/

- name: Grant execute permission for gradlew
run: chmod +x ./gradlew
Expand Down
25 changes: 11 additions & 14 deletions .github/workflows/prTest.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,32 +8,29 @@ jobs:
PRTest:
runs-on: ubuntu-latest
permissions: write-all

steps:
- uses: actions/checkout@v4

- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '17'
distribution: 'temurin'
token: ${{ secrets.ACTIONS_TOKEN }}
submodules: true

- name: make application.yml
run: |
mkdir -p src/main/resources
cp HERE-WE-SECRET/main/resources/application.yml src/main/resources/
cp HERE-WE-SECRET/main/resources/application-dev.yml src/main/resources/
cp HERE-WE-SECRET/main/resources/application-prod.yml src/main/resources/
cp HERE-WE-SECRET/main/resources/application-common.yml src/main/resources/

cp GitGet-BACK-SECRET/main/resources/application.yml src/main/resources/
cp GitGet-BACK-SECRET/main/resources/application-prod.yml src/main/resources/
cp GitGet-BACK-SECRET/main/resources/application-common.yml src/main/resources/

mkdir -p src/test/resources
cp HERE-WE-SECRET/test/resources/application.yml src/test/resources/
cp HERE-WE-SECRET/test/resources/application-test.yml src/test/resources/
cp GitGet-BACK-SECRET/test/resources/application.yml src/test/resources/
cp GitGet-BACK-SECRET/test/resources/application-test.yml src/test/resources/

echo "Main resources contents:"
ls -la src/main/resources/
echo "Test resources contents:"
ls -la src/test/resources/


- name: Grant execute permission for gradlew
run: chmod +x ./gradlew
Expand Down
2 changes: 1 addition & 1 deletion GitGet-BACK-SECRET
Open in desktop
Submodule GitGet-BACK-SECRET updated from d3101d to 1b02d6
28 changes: 15 additions & 13 deletions ...in/java/com/genius/gitget/challenge/certification/repository/CertificationRepository.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,27 +1,29 @@
package com.genius.gitget.challenge.certification.repository;

import com.genius.gitget.challenge.certification.domain.CertificateStatus;
import com.genius.gitget.challenge.certification.domain.Certification;
import java.time.LocalDate;
import java.util.List;
import java.util.Optional;

import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

import com.genius.gitget.challenge.certification.domain.CertificateStatus;
import com.genius.gitget.challenge.certification.domain.Certification;

public interface CertificationRepository extends JpaRepository<Certification, Long> {

@Query("select c from Certification c where c.certificatedAt = :targetDate and c.participant.id = :participantId")
Optional<Certification> findByDate(@Param("targetDate") LocalDate targetDate,
@Param("participantId") Long participantId);
@Query("select c from Certification c where c.participant.id = :participantId AND c.certificatedAt = :targetDate")
Optional<Certification> findByDate(@Param("targetDate") LocalDate targetDate,
@Param("participantId") Long participantId);

@Query("select c from Certification c where c.participant.id = :participantId and c.certificatedAt between :startDate AND :endDate order by c.currentAttempt desc")
List<Certification> findByDuration(@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate,
@Param("participantId") Long participantId);
@Query("select c from Certification c where c.participant.id = :participantId and c.certificatedAt between :startDate AND :endDate order by c.currentAttempt desc")
List<Certification> findByDuration(@Param("startDate") LocalDate startDate,
@Param("endDate") LocalDate endDate,
@Param("participantId") Long participantId);

@Query("select c from Certification c where c.participant.id = :participantId and c.certificationStatus = :status and c.certificatedAt <= :currentDate")
List<Certification> findByStatus(@Param("participantId") Long participantId,
@Param("status") CertificateStatus status,
@Param("currentDate") LocalDate currentDate);
@Query("select c from Certification c where c.participant.id = :participantId and c.certificatedAt <= :currentDate AND c.certificationStatus = :status")
List<Certification> findByStatus(@Param("participantId") Long participantId,
@Param("status") CertificateStatus status,
@Param("currentDate") LocalDate currentDate);
}