Skip to content

Commit

Permalink
Merge pull request #20 from lotteon2/dev-user-refactor
Browse files Browse the repository at this point in the history
fix: fix the updating the updatedAt when init the store-user status
indl1670 authored Dec 26, 2023
2 parents 7e94e33 + a7eeb62 commit d40ddc6
Showing 5 changed files with 25 additions and 67 deletions.
Original file line number Diff line number Diff line change
@@ -39,7 +39,7 @@ public List<StoreManagerApplicationData> mapToData(List<StoreManager> managerLis
applicationDataList.add(
StoreManagerApplicationData.builder().key(storeManager.getId())
.storeManagerName(storeManager.getName())
.requestDate(storeManager.getCreatedAt())
.requestDate(storeManager.getUpdatedAt())
.storeManagerBusinessNumber(storeManager.getBusinessNumberImage()).build());
}
return applicationDataList;
Original file line number Diff line number Diff line change
@@ -6,17 +6,20 @@
import javax.persistence.MappedSuperclass;
import javax.persistence.PrePersist;
import lombok.Getter;
import lombok.Setter;
import org.springframework.data.annotation.CreatedDate;
import org.springframework.data.annotation.LastModifiedDate;
import org.springframework.data.jpa.domain.support.AuditingEntityListener;

@Setter

@Getter
@MappedSuperclass
@EntityListeners(AuditingEntityListener.class)
public class BaseEntity {

@CreatedDate
@Column(name = "created_at")
@Column(name = "created_at", nullable = false, updatable = false)
private LocalDateTime createdAt;

@LastModifiedDate
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ public static StoreManager createCommandToStoreManager(StoreManagerSignUpCommand
signUpCommand.getEmail()).id(signUpCommand.getId()).name(signUpCommand.getName()).build();
}

public static StoreManager storeManagerUpdatedPhoneNumber(StoreManager storeManager,
public static StoreManager storeManagerUpdatedBusinessNumber(StoreManager storeManager,
String businessNumberImage) {
return StoreManager.builder().email(storeManager.getEmail())
.businessNumberImage(businessNumberImage).id(storeManager.getId())
Original file line number Diff line number Diff line change
@@ -1,27 +1,42 @@
package com.bit.lotte.flower.user.store.service;

import com.bit.lotte.flower.user.common.valueobject.StoreId;
import com.bit.lotte.flower.user.common.valueobject.UserId;
import com.bit.lotte.flower.user.store.entity.StoreManager;
import com.bit.lotte.flower.user.store.mapper.StoreManagerMapper;
import com.bit.lotte.flower.user.store.repository.StoreManagerJpaRepository;
import java.time.LocalDateTime;
import javax.persistence.EntityManager;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import net.bytebuddy.asm.Advice.AssignReturned.ToReturned;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;

@RequiredArgsConstructor
@Service
@Slf4j
public class StoreManagerServiceImpl implements
StoreManagerService<UserId> {

private final StoreManagerJpaRepository repository;
private final FindStoreMangerService findStoreMangerByIdService;
private final EntityManager entityManager;


@Transactional
@Override
public UserId updateBusinessNumber(String email, String businessNumberImage) {
StoreManager storeManager = findStoreMangerByIdService.findByEmail(email);
repository.save(StoreManagerMapper.storeManagerUpdatedPhoneNumber(
storeManager, businessNumberImage));
StoreManager updatedManager = repository.save(
StoreManagerMapper.storeManagerUpdatedBusinessNumber(
storeManager, businessNumberImage));

entityManager.detach(storeManager);
updatedManager.setUpdatedAt(LocalDateTime.now());

storeManager = entityManager.merge(storeManager);

return new UserId(storeManager.getId());
return new UserId(storeManager.getId());
}
}

This file was deleted.

0 comments on commit d40ddc6

Please sign in to comment.