mirror of
https://github.com/nagisa77/OpenIsle.git
synced 2026-05-26 12:38:35 +08:00
Merge pull request #254 from nagisa77/codex/update-draft-create-and-delete-to-adjust-image-references
Handle images in draft service
This commit is contained in:
@@ -8,6 +8,7 @@ import com.openisle.repository.CategoryRepository;
|
|||||||
import com.openisle.repository.DraftRepository;
|
import com.openisle.repository.DraftRepository;
|
||||||
import com.openisle.repository.TagRepository;
|
import com.openisle.repository.TagRepository;
|
||||||
import com.openisle.repository.UserRepository;
|
import com.openisle.repository.UserRepository;
|
||||||
|
import com.openisle.service.ImageUploader;
|
||||||
import org.springframework.transaction.annotation.Transactional;
|
import org.springframework.transaction.annotation.Transactional;
|
||||||
import lombok.RequiredArgsConstructor;
|
import lombok.RequiredArgsConstructor;
|
||||||
import org.springframework.stereotype.Service;
|
import org.springframework.stereotype.Service;
|
||||||
@@ -24,12 +25,15 @@ public class DraftService {
|
|||||||
private final UserRepository userRepository;
|
private final UserRepository userRepository;
|
||||||
private final CategoryRepository categoryRepository;
|
private final CategoryRepository categoryRepository;
|
||||||
private final TagRepository tagRepository;
|
private final TagRepository tagRepository;
|
||||||
|
private final ImageUploader imageUploader;
|
||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public Draft saveDraft(String username, Long categoryId, String title, String content, List<Long> tagIds) {
|
public Draft saveDraft(String username, Long categoryId, String title, String content, List<Long> tagIds) {
|
||||||
User user = userRepository.findByUsername(username)
|
User user = userRepository.findByUsername(username)
|
||||||
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
.orElseThrow(() -> new com.openisle.exception.NotFoundException("User not found"));
|
||||||
Draft draft = draftRepository.findByAuthor(user).orElse(new Draft());
|
Draft draft = draftRepository.findByAuthor(user).orElse(new Draft());
|
||||||
|
String oldContent = draft.getContent();
|
||||||
|
boolean existing = draft.getId() != null;
|
||||||
draft.setAuthor(user);
|
draft.setAuthor(user);
|
||||||
draft.setTitle(title);
|
draft.setTitle(title);
|
||||||
draft.setContent(content);
|
draft.setContent(content);
|
||||||
@@ -45,7 +49,13 @@ public class DraftService {
|
|||||||
tags.addAll(tagRepository.findAllById(tagIds));
|
tags.addAll(tagRepository.findAllById(tagIds));
|
||||||
}
|
}
|
||||||
draft.setTags(tags);
|
draft.setTags(tags);
|
||||||
return draftRepository.save(draft);
|
Draft saved = draftRepository.save(draft);
|
||||||
|
if (existing) {
|
||||||
|
imageUploader.adjustReferences(oldContent == null ? "" : oldContent, content);
|
||||||
|
} else {
|
||||||
|
imageUploader.addReferences(imageUploader.extractUrls(content));
|
||||||
|
}
|
||||||
|
return saved;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Transactional(readOnly = true)
|
@Transactional(readOnly = true)
|
||||||
@@ -56,7 +66,11 @@ public class DraftService {
|
|||||||
|
|
||||||
@Transactional
|
@Transactional
|
||||||
public void deleteDraft(String username) {
|
public void deleteDraft(String username) {
|
||||||
userRepository.findByUsername(username)
|
userRepository.findByUsername(username).ifPresent(user ->
|
||||||
.ifPresent(draftRepository::deleteByAuthor);
|
draftRepository.findByAuthor(user).ifPresent(draft -> {
|
||||||
|
imageUploader.removeReferences(imageUploader.extractUrls(draft.getContent()));
|
||||||
|
draftRepository.delete(draft);
|
||||||
|
})
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user