Skip to content

Commit

Permalink
fixed comments.
Browse files Browse the repository at this point in the history
  • Loading branch information
@alexsilaghi
alexsilaghi committed Dec 10, 2024
1 parent 6b9f2f9 commit 376cc34
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 27 deletions.
4 changes: 2 additions & 2 deletions ...rotege/webprotege/postcoordinationservice/model/PostCoordinationCustomScalesRevision.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ public record PostCoordinationCustomScalesRevision(UserId userId,
@Indexed(name = "rev_timestamp", direction = IndexDirection.DESCENDING) Long timestamp,
Set<PostCoordinationCustomScalesValueEvent> postCoordinationEvents,
CommitStatus commitStatus,
ChangeRequestId changeRequestId) implements Comparable<PostCoordinationCustomScalesRevision> {
String changeRequestId) implements Comparable<PostCoordinationCustomScalesRevision> {


public static PostCoordinationCustomScalesRevision create(UserId userId, Set<PostCoordinationCustomScalesValueEvent> postCoordinationEventList) {
Expand All @@ -23,7 +23,7 @@ public static PostCoordinationCustomScalesRevision create(UserId userId, Set<Pos

public static PostCoordinationCustomScalesRevision create(UserId userId, Set<PostCoordinationCustomScalesValueEvent> postCoordinationEventList, ChangeRequestId changeRequestId) {
CommitStatus status = changeRequestId != null && changeRequestId.id() != null ? CommitStatus.UNCOMMITTED : CommitStatus.COMMITTED;
return new PostCoordinationCustomScalesRevision(userId, Instant.now().toEpochMilli(), postCoordinationEventList, status, changeRequestId);
return new PostCoordinationCustomScalesRevision(userId, Instant.now().toEpochMilli(), postCoordinationEventList, status, changeRequestId != null ? changeRequestId.id() : null);
}

public static PostCoordinationCustomScalesRevision createCommittedClone(PostCoordinationCustomScalesRevision revision) {
Expand Down
4 changes: 2 additions & 2 deletions ...otege/webprotege/postcoordinationservice/model/PostCoordinationSpecificationRevision.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,15 +14,15 @@ public record PostCoordinationSpecificationRevision(UserId userId,
@Indexed(name = "spec_timestamp", direction = IndexDirection.DESCENDING) Long timestamp,
Set<PostCoordinationViewEvent> postCoordinationEvents,
CommitStatus commitStatus,
ChangeRequestId changeRequestId) implements Comparable<PostCoordinationSpecificationRevision>{
String changeRequestId) implements Comparable<PostCoordinationSpecificationRevision>{


public static PostCoordinationSpecificationRevision create(UserId userId, Set<PostCoordinationViewEvent> postCoordinationEventList) {
return create(userId, postCoordinationEventList, null);
}
public static PostCoordinationSpecificationRevision create(UserId userId, Set<PostCoordinationViewEvent> postCoordinationEventList, ChangeRequestId changeRequestId) {
CommitStatus status = changeRequestId != null && changeRequestId.id() != null ? CommitStatus.UNCOMMITTED : CommitStatus.COMMITTED;
return new PostCoordinationSpecificationRevision(userId, Instant.now().toEpochMilli(), postCoordinationEventList, status, changeRequestId);
return new PostCoordinationSpecificationRevision(userId, Instant.now().toEpochMilli(), postCoordinationEventList, status, changeRequestId != null ? changeRequestId.id() : null);
}

public static PostCoordinationSpecificationRevision createCommittedClone(PostCoordinationSpecificationRevision revision) {
Expand Down
47 changes: 24 additions & 23 deletions ...d/protege/webprotege/postcoordinationservice/repositories/PostCoordinationRepository.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,8 @@
import edu.stanford.protege.webprotege.postcoordinationservice.model.*;
import edu.stanford.protege.webprotege.postcoordinationservice.services.ReadWriteLockService;
import org.bson.Document;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.data.mongodb.core.MongoTemplate;
import org.springframework.data.mongodb.core.query.*;
import org.springframework.stereotype.Repository;
Expand All @@ -23,8 +25,7 @@
@Repository
public class PostCoordinationRepository {


private static final String CHANGE_REQUEST_ID = "changeRequestId";
private final static Logger LOGGER = LoggerFactory.getLogger(PostCoordinationRepository.class);

private final MongoTemplate mongoTemplate;
private final ReadWriteLockService readWriteLock;
Expand All @@ -36,8 +37,10 @@ public PostCoordinationRepository(MongoTemplate mongoTemplate, ReadWriteLockServ
}

public void bulkWriteDocuments(List<InsertOneModel<Document>> listOfInsertOneModelDocument, String collectionName) {
var collection = mongoTemplate.getCollection(collectionName);
collection.bulkWrite(listOfInsertOneModelDocument);
readWriteLock.executeWriteLock(() -> {
var collection = mongoTemplate.getCollection(collectionName);
collection.bulkWrite(listOfInsertOneModelDocument);
});
}

public void addSpecificationRevision(String whoficEntityIri, ProjectId projectId, PostCoordinationSpecificationRevision specificationRevision) {
Expand All @@ -62,7 +65,6 @@ public EntityPostCoordinationHistory saveNewSpecificationHistory(EntityPostCoord
return readWriteLock.executeWriteLock(() -> mongoTemplate.save(specificationHistory, POSTCOORDINATION_HISTORY_COLLECTION));
}


public void addCustomScalesRevision(String whoficEntityIri, ProjectId projectId, PostCoordinationCustomScalesRevision customScalesRevision) {
Query query = new Query();
query.addCriteria(Criteria.where(WHOFIC_ENTITY_IRI).is(whoficEntityIri)
Expand All @@ -85,14 +87,14 @@ public EntityCustomScalesValuesHistory saveNewCustomScalesHistory(EntityCustomSc
return readWriteLock.executeWriteLock(() -> mongoTemplate.save(entityScaleValueHistory, POSTCOORDINATION_CUSTOM_SCALES_COLLECTION));
}


public void writeDocument(Document document, String collectionName) {
readWriteLock.executeWriteLock(() -> {
var collection = mongoTemplate.getCollection(collectionName);
collection.insertOne(document);
});
}


public Optional<EntityPostCoordinationHistory> findHistoryByEntityIriAndProjectId(String entityIri, ProjectId projectId) {

Query query = new Query();
Expand Down Expand Up @@ -143,10 +145,12 @@ public void deletePostCoordinationCustomScalesRevision(ChangeRequestId changeReq
.and(PROJECT_ID).is(projectId.value())
);
Update update = new Update().pull("postCoordinationCustomScalesRevisions",
new Document("changeRequestId._id", changeRequestId.id()));
new Document("changeRequestId", changeRequestId.id()));

readWriteLock.executeReadLock(() ->
Optional.of(mongoTemplate.updateFirst(query,update, EntityCustomScalesValuesHistory.class, CUSTOM_SCALE_REVISIONS ))
readWriteLock.executeWriteLock(() -> {
UpdateResult updateResult = mongoTemplate.updateFirst(query, update, EntityCustomScalesValuesHistory.class, CUSTOM_SCALE_REVISIONS);
LOGGER.info("Removed custom scales revision for " + entityIri + " with result : " + updateResult);
}
);
}

Expand All @@ -158,50 +162,47 @@ public void deletePostCoordinationSpecificationRevision(ChangeRequestId changeRe
.and(PROJECT_ID).is(projectId.value())
);
Update update = new Update().pull("postCoordinationRevisions",
new Document("changeRequestId._id", changeRequestId.id()));

readWriteLock.executeReadLock(() -> {

UpdateResult updateResult = mongoTemplate.updateFirst(query,update, EntityPostCoordinationHistory.class, POSTCOORDINATION_HISTORY_COLLECTION);
System.out.println(updateResult);
return null;
}
new Document("changeRequestId", changeRequestId.id()));

readWriteLock.executeWriteLock(() -> {
UpdateResult updateResult = mongoTemplate.updateFirst(query, update, EntityPostCoordinationHistory.class, POSTCOORDINATION_HISTORY_COLLECTION);
LOGGER.info("Removed custom scales revision for " + entityIri + " with result : " + updateResult);
}
);
}

public void commitPostCoordinationSpecificationRevision(ChangeRequestId changeRequestId, ProjectId projectId, String entityIri){
public void commitPostCoordinationSpecificationRevision(ChangeRequestId changeRequestId, ProjectId projectId, String entityIri) {
Query query = new Query(Criteria.where(WHOFIC_ENTITY_IRI)
.is(entityIri)
.and(PROJECT_ID).is(projectId.id())
.and("postCoordinationRevisions")
.elemMatch(
Criteria.where("changeRequestId").is(changeRequestId)
Criteria.where("changeRequestId").is(changeRequestId.id())
.and("commitStatus").is(CommitStatus.UNCOMMITTED.name())
)
);
Update update = new Update().set("postCoordinationRevisions.$.commitStatus", CommitStatus.COMMITTED.name());

readWriteLock.executeReadLock(() ->
Optional.of(mongoTemplate.updateFirst(query,update, EntityPostCoordinationHistory.class, POSTCOORDINATION_HISTORY_COLLECTION))
Optional.of(mongoTemplate.updateFirst(query, update, EntityPostCoordinationHistory.class, POSTCOORDINATION_HISTORY_COLLECTION))
);
}

public void commitPostCoordinationCustomScalesRevision(ChangeRequestId changeRequestId, ProjectId projectId, String entityIri){
public void commitPostCoordinationCustomScalesRevision(ChangeRequestId changeRequestId, ProjectId projectId, String entityIri) {
Query query = new Query(Criteria.where(WHOFIC_ENTITY_IRI)
.is(entityIri)
.and(PROJECT_ID).is(projectId.id())
.and("postCoordinationCustomScalesRevisions")
.elemMatch(
Criteria.where("changeRequestId").is(changeRequestId)
Criteria.where("changeRequestId").is(changeRequestId.id())
.and("commitStatus").is(CommitStatus.UNCOMMITTED.name())
)
);

Update update = new Update().set("postCoordinationCustomScalesRevisions.$.commitStatus", CommitStatus.COMMITTED.name());

readWriteLock.executeReadLock(() ->
Optional.of(mongoTemplate.updateFirst(query,update, EntityCustomScalesValuesHistory.class, CUSTOM_SCALE_REVISIONS ))
Optional.of(mongoTemplate.updateFirst(query, update, EntityCustomScalesValuesHistory.class, CUSTOM_SCALE_REVISIONS))
);
}
}

0 comments on commit 376cc34

Please sign in to comment.