Mongo can now properly access ID from nested object, which prevents c…

…reation of new ID and solves mismatch problem
Graylog2 · Feb 14, 2025 · eba183c · eba183c
1 parent 036f3a0
commit eba183c
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/graylog2-server/src/main/java/org/graylog/plugins/views/search/jobs/SearchJobState.java b/graylog2-server/src/main/java/org/graylog/plugins/views/search/jobs/SearchJobState.java
@@ -30,7 +30,6 @@
 import org.joda.time.DateTime;
 import org.joda.time.DateTimeZone;
 import org.mongojack.Id;
-import org.mongojack.ObjectId;
 
 import javax.annotation.Nullable;
 import java.util.Map;
@@ -48,6 +47,7 @@ public abstract class SearchJobState implements MongoEntity {
     public static final String ERRORS_FIELD = "error_message";
 
     @JsonUnwrapped
+    @Id
     public abstract SearchJobIdentifier identifier();
 
     @JsonProperty(STATUS_FIELD)
@@ -144,8 +144,6 @@ public static SearchJobState createDoneJobFrom(final SearchJobState existingSear
     }
 
     @Override
-    @ObjectId
-    @Id
     @JsonIgnore
     public String id() {
         return identifier().id();

diff --git a/...og2-server/src/main/java/org/graylog/plugins/views/search/jobs/SearchJobStateService.java b/...og2-server/src/main/java/org/graylog/plugins/views/search/jobs/SearchJobStateService.java
@@ -94,9 +94,6 @@ public long expireOlderThan(final DateTime dateTime) {
     }
 
     public SearchJobState create(final SearchJobState searchJobState) {
-//        if (searchJobState.identifier().id() != null) {
-//            throw new IllegalStateException("ID should be null for a call to create a new SearchJobState");
-//        } //TODO: check mismatch between IDs in Mongo and inmemory cache
         final InsertOneResult insertOneResult = this.collection.insertOne(searchJobState);
         return get(MongoUtils.insertedIdAsString(insertOneResult)).orElseThrow(() -> new IllegalStateException("Unable to retrieve saved search job state!"));
     }

diff --git a/...server/src/test/java/org/graylog/plugins/views/search/jobs/SearchJobStateServiceTest.java b/...server/src/test/java/org/graylog/plugins/views/search/jobs/SearchJobStateServiceTest.java
@@ -57,18 +57,18 @@ public void setUp() {
     @Test
     public void testSaveAndGet() {
         final SearchJobState toBeSaved = SearchJobState.builder()
-                .identifier(new SearchJobIdentifier(null, "677fd86ae6db8b71a8e10e3e", "john", "dcae52e4-777e-4e3f-8e69-61df7a607016"))
+                .identifier(new SearchJobIdentifier("777fd86ae6db8b71a8e10000", "677fd86ae6db8b71a8e10e3e", "john", "dcae52e4-777e-4e3f-8e69-61df7a607016"))
                 .result(noResult())
                 .status(SearchJobStatus.RUNNING)
                 .progress(42)
                 .createdAt(DateTime.now(DateTimeZone.UTC))
                 .updatedAt(DateTime.now(DateTimeZone.UTC))
                 .build();
-        final SearchJobState saved = toTest.create(toBeSaved);
-        final Optional<SearchJobState> retrieved = toTest.get(saved.id());
+        toTest.create(toBeSaved);
+        final Optional<SearchJobState> retrieved = toTest.get("777fd86ae6db8b71a8e10000");
         assertTrue(retrieved.isPresent());
         assertEquals(toBeSaved.toBuilder()
-                .identifier(new SearchJobIdentifier(saved.id(), "677fd86ae6db8b71a8e10e3e", "john", "dcae52e4-777e-4e3f-8e69-61df7a607016"))
+                .identifier(new SearchJobIdentifier("777fd86ae6db8b71a8e10000", "677fd86ae6db8b71a8e10e3e", "john", "dcae52e4-777e-4e3f-8e69-61df7a607016"))
                 .build(), retrieved.get());
     }