7x31/databasir
1
0
Fork 0
mirror of https://github.com/vran-dev/databasir.git synced 2025-08-09 12:06:31 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: duplicate project version when concurrency (#108)

Browse Source
This commit is contained in:
vran
2022-04-19 22:32:22 +08:00
committed by GitHub
parent 821a3673d3
commit ad4b1d9fe0
8 changed files with 29 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/main/java/com/databasir/core/domain/DomainErrors.java
View File

@@ -45,7 +45,7 @@ public enum DomainErrors implements DatabasirErrors {
INVALID_MOCK_DATA_SCRIPT("A_10029", "不合法的表达式"),
CANNOT_DELETE_SELF("A_10030", "无法对自己执行删除账号操作"),
DRIVER_CLASS_NOT_FOUND("A_10031", "获取驱动类名失败"),
;
DATABASE_DOCUMENT_DUPLICATE_KEY("A_10032", "文档版本重复");
private final String errCode;

10
core/src/main/java/com/databasir/core/domain/document/service/DocumentService.java
View File

@@ -1,5 +1,6 @@
package com.databasir.core.domain.document.service;
import com.databasir.common.DatabasirException;
import com.databasir.core.Databasir;
import com.databasir.core.DatabasirConfig;
import com.databasir.core.diff.Diffs;
@@ -21,6 +22,7 @@ import com.databasir.dao.value.DocumentDiscussionCountPojo;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.jooq.tools.StringUtils;
import org.springframework.dao.DuplicateKeyException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.stereotype.Service;
@@ -146,7 +148,13 @@ public class DocumentService {
Integer projectId) {
var pojo = documentPojoConverter.toDatabasePojo(projectId, meta, version);
final Integer docId = databaseDocumentDao.insertAndReturnId(pojo);
final Integer docId;
try {
docId = databaseDocumentDao.insertAndReturnId(pojo);
} catch (DuplicateKeyException e) {
log.warn("ignore insert database document projectId={} version={}", projectId, version);
throw new DatabasirException(DomainErrors.DATABASE_DOCUMENT_DUPLICATE_KEY);
}
meta.getTables().forEach(table -> {
TableDocumentPojo tableMeta =
documentPojoConverter.toTablePojo(docId, table);

6
core/src/main/java/com/databasir/core/domain/project/service/ProjectService.java
View File

@@ -188,12 +188,12 @@ public class ProjectService {
@Transactional
public Optional<Integer> createSyncTask(Integer projectId, Integer userId, boolean ignoreIfExists) {
if (!projectDao.existsById(projectId)) {
log.info("create sync task failed, because project not exists, projectId={}", projectId);
return Optional.empty();
log.warn("create sync task failed, because project not exists, projectId={}", projectId);
throw DomainErrors.PROJECT_NOT_FOUND.exception();
}
var validTaskStatus = List.of(ProjectSyncTaskStatus.NEW, ProjectSyncTaskStatus.RUNNING);
if (ignoreIfExists && projectSyncTaskDao.existsByProjectId(projectId, validTaskStatus)) {
log.info("create sync task failed, it's already exists, projectId={}", projectId);
log.warn("create sync task failed, it's already exists, projectId={}", projectId);
return Optional.empty();
}
ProjectSyncTaskPojo projectSyncTask = new ProjectSyncTaskPojo();