Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@

import lombok.RequiredArgsConstructor;
import org.intellij.lang.annotations.Language;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.stereotype.Component;
import org.springframework.transaction.annotation.Transactional;
Expand All @@ -12,16 +13,15 @@
public class ClapMilestoneGuard {
private final JdbcTemplate jdbcTemplate;

@Language("PostgreSQL")
private static final String SQL = """

INSERT INTO clap_milestone_hit (stamp_id, milestone, created_at)
VALUES (?, ?, now())
ON CONFLICT (stamp_id, milestone) DO NOTHING
""";
@Value("${spring.jpa.properties.hibernate.default_schema}")
private String schema;

@Transactional
public boolean tryMarkFirstHit(long stampId, int milestone) {
return jdbcTemplate.update(SQL, stampId, milestone) == 1;
String sql =
"INSERT INTO " + schema + ".clap_milestone_hit (stamp_id, milestone, created_at) " +
"VALUES (?, ?, now()) " +
"ON CONFLICT (stamp_id, milestone) DO NOTHING";
return jdbcTemplate.update(sql, stampId, milestone) == 1;
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.Query;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.stereotype.Repository;

@Repository
Expand All @@ -12,16 +13,19 @@ public class StampRepositoryImpl implements StampRepositoryCustom {
@PersistenceContext
private EntityManager em;

@Value("${spring.jpa.properties.hibernate.default_schema}")
private String schema;

@Override
public StampCounts incrementClapCountReturning(Long stampId, int increment) {
// Postgres 네이티브. 버전 증가까지 함께 처리해 JPA @Version과 의미 일치.
String sql = """
UPDATE stamp
SET clap_count = clap_count + :increment,
version = version + 1
WHERE id = :id
RETURNING clap_count, version
""";
// 스키마를 붙여서 안전하게 실행
final String sql = String.format("""
UPDATE %s.stamp
SET clap_count = clap_count + :increment,
version = version + 1
WHERE id = :id
RETURNING clap_count, version
""", schema);

Query q = em.createNativeQuery(sql);
q.setParameter("increment", increment);
Expand Down
20 changes: 12 additions & 8 deletions src/main/java/org/sopt/app/presentation/stamp/StampController.java
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@
import lombok.val;
import org.sopt.app.facade.SoptampFacade;
import org.sopt.app.presentation.stamp.StampResponse.SoptampReportResponse;
import org.springframework.data.domain.PageRequest;
import org.springframework.data.domain.Pageable;
import org.springframework.data.web.PageableDefault;
import org.springframework.http.ResponseEntity;
import org.springframework.security.core.annotation.AuthenticationPrincipal;
import org.springframework.transaction.annotation.Transactional;
Expand Down Expand Up @@ -120,17 +120,21 @@ public ResponseEntity<ClapResponse.AddClapResponse> addClap(

@Operation(summary = "박수 친 유저 목록 조회 (본인 미션)")
@ApiResponses({
@ApiResponse(responseCode = "200", description = "success"),
@ApiResponse(responseCode = "500", description = "server error", content = @Content)
@ApiResponse(responseCode = "200", description = "success"),
@ApiResponse(responseCode = "500", description = "server error", content = @Content)
})
@GetMapping("/{stampId}/clappers")
public ResponseEntity<ClapResponse.ClapUserList> getClappersByStampId(
@AuthenticationPrincipal Long userId,
@PathVariable Long stampId,
@PageableDefault(size = 25) Pageable pageable
@AuthenticationPrincipal Long userId,
@PathVariable Long stampId,
@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "25") int size
) {
val page = soptampFacade.getClapUsersPage(userId, stampId, pageable);
val response = stampResponseMapper.of(page.getPage(), page.getProfiles(), page.getImageMap());
if (page < 0) page = 0;
if (size < 1) size = 25;
Pageable pageable = PageRequest.of(page, size);
val pageData = soptampFacade.getClapUsersPage(userId, stampId, pageable);
val response = stampResponseMapper.of(pageData.getPage(), pageData.getProfiles(), pageData.getImageMap());

return ResponseEntity.ok(response);
}
Expand Down