diff --git a/build.gradle b/build.gradle index 840e3061..b4439e10 100644 --- a/build.gradle +++ b/build.gradle @@ -8,7 +8,7 @@ allprojects { apply plugin: 'idea' group = 'org.janelia.jacs-model' - version = '2.81' + version = '2.82' } subprojects { diff --git a/jacs-model-access/src/main/java/org/janelia/model/access/domain/dao/mongo/TmNeuronMetadataMongoDao.java b/jacs-model-access/src/main/java/org/janelia/model/access/domain/dao/mongo/TmNeuronMetadataMongoDao.java index 9239aea6..858ad6a6 100644 --- a/jacs-model-access/src/main/java/org/janelia/model/access/domain/dao/mongo/TmNeuronMetadataMongoDao.java +++ b/jacs-model-access/src/main/java/org/janelia/model/access/domain/dao/mongo/TmNeuronMetadataMongoDao.java @@ -82,7 +82,8 @@ public TmNeuronMetadata createTmNeuronInWorkspace(String subjectKey, TmNeuronMet neuronMetadata.setLargeNeuron(true); } LOG.info("creating neuron"); - persistedNeuronMetadata = createNeuronWithExistingId(neuronMetadata, collection, neuronOwnerKey); + persistedNeuronMetadata = + saveNeuron(neuronMetadata, workspace.getNeuronCollection(), subjectKey, false); if (isLarge) { saveLargeNeuronPointData(persistedNeuronMetadata.getId(), pointData); } @@ -294,25 +295,6 @@ public List getOperations(Long workspaceId, Long neuronId, Date sta return MongoDaoHelper.find(filter, null, 0, 10000, operationCollection, TmOperation.class); } - - private TmNeuronMetadata createNeuronWithExistingId(TmNeuronMetadata entity, - String collectionName, String subjectKey) { - MongoCollection mongoCollection = getNeuronCollection(collectionName); - - Date now = new Date(); - for (TmGeoAnnotation anno : entity.getRootAnnotations()) { - anno.setParentId(entity.getId()); - } - - entity.setOwnerKey(subjectKey); - entity.getReaders().add(subjectKey); - entity.getWriters().add(subjectKey); - entity.setCreationDate(now); - entity.setUpdatedDate(now); - mongoCollection.insertOne(entity); - return entity; - } - private TmNeuronMetadata saveNeuron(TmNeuronMetadata entity, String collectionName, String subjectKey, boolean forceCreate) { MongoCollection mongoCollection = getNeuronCollection(collectionName);