Core - API - Fix to oqm core interacting entity getting improperly im…

…ported
Epic-Breakfast-Productions · Jul 30, 2024 · 026834c · 026834c
1 parent a4c7ba8
commit 026834c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 12 deletions.
diff --git a/...are/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/config/CoreApiInteractingEntity.java b/...are/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/config/CoreApiInteractingEntity.java
@@ -1,5 +1,6 @@
 package tech.ebp.oqm.core.api.config;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
 import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import lombok.Getter;
@@ -31,30 +32,34 @@ public CoreApiInteractingEntity(
 	){
 		this.email = email;
 	}
-	
+
 	@Getter
 	private String email;
-
+
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
 	@Override
 	public ObjectId getId() {
 		return BS_ID;
 	}
-
+
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
 	@Override
 	public String getName() {
 		return "Core API";
 	}
-
+
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
 	@Override
 	public InteractingEntityType getInteractingEntityType() {
 		return InteractingEntityType.CORE_API;
 	}
-
+
+	@JsonProperty(access = JsonProperty.Access.READ_ONLY)
 	@Override
 	public Set<String> getRoles() {
 		return new HashSet<>(){{add("Yes");}};
 	}
-	
+
 	@Override
 	public boolean updateFrom(JsonWebToken jwt) {
 		return false;

diff --git a/...src/main/java/tech/ebp/oqm/core/api/model/object/interactingEntity/InteractingEntity.java b/...src/main/java/tech/ebp/oqm/core/api/model/object/interactingEntity/InteractingEntity.java
@@ -12,6 +12,7 @@
 import org.bson.codecs.pojo.annotations.BsonDiscriminator;
 import org.eclipse.microprofile.jwt.Claims;
 import org.eclipse.microprofile.jwt.JsonWebToken;
+import tech.ebp.oqm.core.api.config.CoreApiInteractingEntity;
 import tech.ebp.oqm.core.api.model.object.AttKeywordMainObject;
 import tech.ebp.oqm.core.api.model.object.interactingEntity.externalService.GeneralService;
 import tech.ebp.oqm.core.api.model.object.interactingEntity.externalService.plugin.PluginService;
@@ -29,6 +30,7 @@
 	@JsonSubTypes.Type(value = User.class, name = "USER"),
 	@JsonSubTypes.Type(value = PluginService.class, name = "SERVICE_PLUGIN"),
 	@JsonSubTypes.Type(value = GeneralService.class, name = "SERVICE_GENERAL"),
+	@JsonSubTypes.Type(value = CoreApiInteractingEntity.class, name = "CORE_API"),
 })
 @BsonDiscriminator
 @Data

diff --git a/...src/main/java/tech/ebp/oqm/core/api/service/importExport/importing/DataImportService.java b/...src/main/java/tech/ebp/oqm/core/api/service/importExport/importing/DataImportService.java
@@ -109,12 +109,6 @@ private static List<File> getObjectHistoryFiles(Path directory) throws IOExcepti
 	@Inject
 	OqmDatabaseService oqmDatabaseService;
 
-	@Inject
-	InteractingEntityService interactingEntityService;
-
-	@Inject
-	CustomUnitService customUnitService;
-
 	@Inject
 	ImageService imageService;
 

diff --git a/...h/ebp/oqm/core/api/service/importExport/importing/importer/InteractingEntityImporter.java b/...h/ebp/oqm/core/api/service/importExport/importing/importer/InteractingEntityImporter.java
@@ -5,7 +5,9 @@
 import jakarta.inject.Inject;
 import lombok.AccessLevel;
 import lombok.Getter;
+import lombok.extern.slf4j.Slf4j;
 import org.bson.types.ObjectId;
+import tech.ebp.oqm.core.api.config.CoreApiInteractingEntity;
 import tech.ebp.oqm.core.api.model.object.MainObject;
 import tech.ebp.oqm.core.api.model.object.ObjectUtils;
 import tech.ebp.oqm.core.api.model.object.interactingEntity.InteractingEntity;
@@ -20,13 +22,18 @@
 import java.util.*;
 import java.util.stream.Collectors;
 
+@Slf4j
 @ApplicationScoped
 public class InteractingEntityImporter extends TopLevelImporter<EntityImportResult> {
 
 	@Inject
 	@Getter(AccessLevel.PRIVATE)
 	InteractingEntityService interactingEntityService;
 
+	@Inject
+	@Getter(AccessLevel.PRIVATE)
+	CoreApiInteractingEntity coreApiInteractingEntity;
+
 
 	@Override
 	public Path getObjectDirPath(Path topLevelPath) {
@@ -51,11 +58,20 @@ public EntityImportResult readInObjectsImpl(
 		long addedEntityCount = 0;
 
 		for(File curEntityDataFile : getObjectFiles(directory)){
+			log.debug("Reading in interacting entity from file {}", curEntityDataFile.getName());
+
+			if(curEntityDataFile.getName().startsWith(this.getCoreApiInteractingEntity().getId().toHexString())){
+				log.info("File contains core api interacting entity. Skipping.");
+				continue;
+			}
+
 			InteractingEntity importingUser = ObjectUtils.OBJECT_MAPPER.readValue(curEntityDataFile, InteractingEntity.class);
 			//if we already have this exact user
 			if(existentUserIds.contains(importingUser.getId())){
+				log.info("Interacting entity already present.");
 				continue;
 			}
+			log.debug("Importing interacting entity: {}", importingUser);
 
 			ObjectId hit = null;
 			if(options.getInteractingEntityMapStrategies().contains(InteractingEntityMapStrategy.EMAIL)){

diff --git a/...e/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/service/mongo/MongoDbAwareService.java b/...e/oqm-core-api/src/main/java/tech/ebp/oqm/core/api/service/mongo/MongoDbAwareService.java
@@ -128,7 +128,9 @@ protected MongoDbAwareService(
 //	}
 
 	protected MongoCollection<T> getCollection(DbCacheEntry db) {
+		log.debug("Getting collection for cache entry {}", db);
 		if(!this.collections.containsKey(db.getDbId())){
+			log.info("Collection for db cache entry not present. Creating. Cache entry: {}", db);
 			this.collections.put(
 				db.getDbId(),
 				db.getMongoDatabase().getCollection(this.collectionName, this.clazz)