Skip to content

Commit

Permalink
Merge remote-tracking branch 'origin/develop' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
jin.geonwoo committed Jan 15, 2025
2 parents c37e15c + c2c29b1 commit 4569ba1
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 5 deletions.
3 changes: 2 additions & 1 deletion src/main/java/org/recordy/server/ServerApplication.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,9 @@

import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.cloud.openfeign.EnableFeignClients;
import org.springframework.scheduling.annotation.EnableScheduling;

@EnableScheduling
@SpringBootApplication
public class ServerApplication {

Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package org.recordy.server.place.domain;

import lombok.AllArgsConstructor;
import lombok.Getter;
import org.springframework.data.annotation.Id;
import org.springframework.data.redis.core.RedisHash;
import org.springframework.data.redis.core.index.Indexed;

@AllArgsConstructor
@Getter
@RedisHash("place")
public class PlaceCacheEntity {

@Id
private Long id;
@Indexed
private String platformId;


public static PlaceCacheEntity from(Place place) {
return new PlaceCacheEntity(
place.getId(),
place.getPlatformId()
);
}
}
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package org.recordy.server.place.repository.impl;

import org.recordy.server.place.domain.PlaceEntity;
import org.recordy.server.place.domain.PlaceCacheEntity;
import org.springframework.data.repository.CrudRepository;

public interface PlaceRedisRepository extends CrudRepository<PlaceEntity, Long> {
public interface PlaceRedisRepository extends CrudRepository<PlaceCacheEntity, Long> {

boolean existsByPlatformId(String platformId);
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,12 @@
package org.recordy.server.place.repository.impl;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.locationtech.jts.geom.Point;
import org.recordy.server.common.message.ErrorMessage;
import org.recordy.server.place.controller.dto.response.PlaceGetResponse;
import org.recordy.server.place.domain.Place;
import org.recordy.server.place.domain.PlaceCacheEntity;
import org.recordy.server.place.domain.PlaceEntity;
import org.recordy.server.place.exception.PlaceException;
import org.recordy.server.place.repository.PlaceRepository;
Expand All @@ -16,6 +18,7 @@
import java.util.List;
import java.util.Objects;

@Slf4j
@RequiredArgsConstructor
@Transactional(readOnly = true)
@Repository
Expand All @@ -35,12 +38,14 @@ public Place save(Place place) {

@Override
public void cache(Place place) {
placeRedisRepository.save(PlaceEntity.create(place));
PlaceCacheEntity entity = placeRedisRepository.save(PlaceCacheEntity.from(place));
log.info("entity with id {} and platformId {} is cached", entity.getId(), entity.getPlatformId());
}

@Override
public boolean existsByPlatformId(String platformId) {
if (placeRedisRepository.existsByPlatformId(platformId)) {
log.info("cache hit for platformId {}", platformId);
return true;
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

import java.util.List;

@RequiredArgsConstructor
@Transactional(readOnly = true)
@Service
Expand Down
3 changes: 3 additions & 0 deletions src/main/java/org/recordy/server/user/domain/User.java
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,9 @@ public void update(UserUpdate update) {
validateProfileImageUrl(update.profileImageUrl());
profileImageUrl = update.profileImageUrl();
}
else {
profileImageUrl = PROFILE_IMAGE_URL;
}
}

private void validateNicknameFormat(String nickname) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -119,9 +119,11 @@ public void signOut(long userId) {
@Transactional
@Override
public void update(UserUpdate update, long id) {
validateDuplicateNickname(update.nickname());

User user = userRepository.findById(id);
if (!user.getNickname().equals(update.nickname())) {
validateDuplicateNickname(update.nickname());
}
user.update(update);

userRepository.save(user);
Expand Down

0 comments on commit 4569ba1

Please sign in to comment.