Implement commands expansion logic

plugins/command-manager/src/main/java/com/wazuh/commandmanager/index/CommandIndex.java

@@ -34,7 +34,7 @@
 import java.util.concurrent.CompletableFuture;
 import java.util.concurrent.ExecutorService;
 
-import com.wazuh.commandmanager.model.Document;
+import com.wazuh.commandmanager.model.Order;
 import com.wazuh.commandmanager.settings.PluginSettings;
 import com.wazuh.commandmanager.utils.IndexTemplateUtils;
 
@@ -72,22 +72,22 @@ public boolean indexExists() {
     /**
      * Indexes an array of documents asynchronously.
      *
-     * @param documents list of instances of the document model to persist in the index.
+     * @param orders list of instances of the document model to persist in the index.
      * @return A CompletableFuture with the RestStatus response from the operation
      */
-    public CompletableFuture<RestStatus> asyncBulkCreate(ArrayList<Document> documents) {
+    public CompletableFuture<RestStatus> asyncBulkCreate(ArrayList<Order> orders) {
         final CompletableFuture<RestStatus> future = new CompletableFuture<>();
         final ExecutorService executor = this.threadPool.executor(ThreadPool.Names.WRITE);
 
         final BulkRequest bulkRequest = new BulkRequest();
-        for (Document document : documents) {
-            log.info("Adding command with id [{}] to the bulk request", document.getId());
+        for (Order order : orders) {
+            log.info("Adding command with id [{}] to the bulk request", order.getId());
             try {
-                bulkRequest.add(createIndexRequest(document));
+                bulkRequest.add(createIndexRequest(order));
             } catch (IOException e) {
                 log.error(
                         "Error creating IndexRequest with document id [{}] due to {}",
-                        document.getId(),
+                        order.getId(),
                         e.getMessage());
             }
         }
@@ -120,15 +120,15 @@ public CompletableFuture<RestStatus> asyncBulkCreate(ArrayList<Document> documen
     /**
      * Create an IndexRequest object from a Document object.
      *
-     * @param document the document to create the IndexRequest for COMMAND_MANAGER_INDEX
+     * @param order the document to create the IndexRequest for COMMAND_MANAGER_INDEX
      * @return an IndexRequest object
      * @throws IOException thrown by XContentFactory.jsonBuilder()
      */
-    private IndexRequest createIndexRequest(Document document) throws IOException {
+    private IndexRequest createIndexRequest(Order order) throws IOException {
         return new IndexRequest()
                 .index(PluginSettings.getIndexName())
-                .source(document.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS))
-                .id(document.getId())
+                .source(order.toXContent(XContentFactory.jsonBuilder(), ToXContent.EMPTY_PARAMS))
+                .id(order.getId())
                 .create(true);
     }
 }

plugins/command-manager/src/main/java/com/wazuh/commandmanager/model/Agent.java

@@ -27,14 +27,17 @@
 public class Agent implements ToXContentObject {
     public static final String AGENT = "agent";
     public static final String GROUPS = "groups";
+    public static final String ID = "id";
+    private final String id;
     private final List<String> groups;
 
     /**
      * Default constructor.
      *
      * @param groups Agent's groups
      */
-    public Agent(List<String> groups) {
+    public Agent(String id, List<String> groups) {
+        this.id = id;
         this.groups = groups;
     }
 
@@ -47,20 +50,23 @@ public Agent(List<String> groups) {
      */
     public static Agent parse(XContentParser parser) throws IOException {
         List<Object> groups = List.of();
+        String id = null;
 
         while (parser.nextToken() != XContentParser.Token.END_OBJECT) {
             String fieldName = parser.currentName();
             parser.nextToken();
             if (fieldName.equals(GROUPS)) {
                 groups = parser.list();
+            } else if (fieldName.equals(ID)) {
+                id = parser.text();
             } else {
                 parser.skipChildren();
             }
         }
 
         // Cast args field Object list to String list
         List<String> convertedGroupFields = (List<String>) (List<?>) (groups);
-        return new Agent(convertedGroupFields);
+        return new Agent(id, convertedGroupFields);
     }
 
     @Override
@@ -72,6 +78,6 @@ public XContentBuilder toXContent(XContentBuilder builder, Params params) throws
 
     @Override
     public String toString() {
-        return "Agent{" + "groups=" + groups + '}';
+        return "Agent{" + "id=" + id + '\'' + ", groups=" + groups + '}';
     }
 }