🐛 fix: merge 충돌 해결

spon-us · Feb 11, 2024 · 4f2e25e · 4f2e25e
1 parent 4bdc749
commit 4f2e25e
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementService.java b/src/main/java/com/sponus/sponusbe/domain/announcement/service/AnnouncementService.java
@@ -3,8 +3,6 @@
 import java.util.List;
 import java.util.Optional;
 
-import com.sponus.sponusbe.domain.announcement.entity.AnnouncementView;
-import com.sponus.sponusbe.domain.announcement.repository.AnnouncementViewRepository;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.web.multipart.MultipartFile;
@@ -18,10 +16,12 @@
 import com.sponus.sponusbe.domain.announcement.dto.response.AnnouncementUpdateResponse;
 import com.sponus.sponusbe.domain.announcement.entity.Announcement;
 import com.sponus.sponusbe.domain.announcement.entity.AnnouncementImage;
+import com.sponus.sponusbe.domain.announcement.entity.AnnouncementView;
 import com.sponus.sponusbe.domain.announcement.entity.enums.AnnouncementStatus;
 import com.sponus.sponusbe.domain.announcement.exception.AnnouncementErrorCode;
 import com.sponus.sponusbe.domain.announcement.exception.AnnouncementException;
 import com.sponus.sponusbe.domain.announcement.repository.AnnouncementRepository;
+import com.sponus.sponusbe.domain.announcement.repository.AnnouncementViewRepository;
 import com.sponus.sponusbe.domain.organization.entity.Organization;
 import com.sponus.sponusbe.domain.s3.S3Service;
 
@@ -56,8 +56,8 @@ public AnnouncementDetailResponse getAnnouncement(Organization organization, Lon
 		AnnouncementView announcementView = announcementViewRepository.findById(announcementId.toString())
 			.orElseGet(() -> AnnouncementView.builder().announcementId(announcementId.toString()).build());
 
-		if (!announcementView.getOrganizationIds().contains(organizationId.toString())) {
-			announcementView.getOrganizationIds().add(organizationId.toString());
+		if (!announcementView.getOrganizationIds().contains(organization.getId().toString())) {
+			announcementView.getOrganizationIds().add(organization.getId().toString());
 			announcementViewRepository.save(announcementView);
 		}
 
@@ -112,7 +112,8 @@ public AnnouncementUpdateResponse updateAnnouncement(
 	public void updateAllViewedAnnouncementViewCount() {
 		Iterable<AnnouncementView> announcementViews = announcementViewRepository.findAll();
 		announcementViews.forEach(announcementView -> {
-			Optional<Announcement> optionalAnnouncement = announcementRepository.findById(Long.parseLong(announcementView.getAnnouncementId()));
+			Optional<Announcement> optionalAnnouncement = announcementRepository.findById(
+				Long.parseLong(announcementView.getAnnouncementId()));
 			if (optionalAnnouncement.isPresent()) {
 				Announcement announcement = optionalAnnouncement.get();
 				announcement.updateViewCount(announcementView.getOrganizationIds().size());