From 53ccea869a29911cb5092d19c1024e44d2765911 Mon Sep 17 00:00:00 2001
From: LSmyrnaios <lsmyrnaios@gmail.com>
Date: Wed, 9 Jun 2021 05:45:07 +0300
Subject: [PATCH] Add an "assignmentId" field in the "Assignment"-class.

---
 .../urls_worker/models/Assignment.java         | 18 ++++++++++++++++--
 .../urls_worker/util/AssignmentHandler.java    |  8 ++++++--
 2 files changed, 22 insertions(+), 4 deletions(-)

diff --git a/src/main/java/eu/openaire/urls_worker/models/Assignment.java b/src/main/java/eu/openaire/urls_worker/models/Assignment.java
index 2e916cf..3d76695 100644
--- a/src/main/java/eu/openaire/urls_worker/models/Assignment.java
+++ b/src/main/java/eu/openaire/urls_worker/models/Assignment.java
@@ -10,12 +10,16 @@ import java.util.List;
 
 @JsonInclude(JsonInclude.Include.NON_NULL)
 @JsonPropertyOrder({
+        "assignmentId",
         "tasks",
         "workerId",
         "date"
 })
 public class Assignment {
 
+    @JsonProperty("assignmentId")
+    private int assignmentId;
+
     @JsonProperty("tasks")
     private List<Task> tasks;
 
@@ -27,12 +31,21 @@ public class Assignment {
 
     public Assignment() {}
 
-    public Assignment(List<Task> tasks, String workerId, Date date) {
+    public Assignment(int assignmentId, List<Task> tasks, String workerId, Date date) {
+        this.assignmentId = assignmentId;
         this.tasks = tasks;
         this.workerId = workerId;
         this.date = date;
     }
 
+    public int getAssignmentId() {
+        return assignmentId;
+    }
+
+    public void setAssignmentId(int assignmentId) {
+        this.assignmentId = assignmentId;
+    }
+
     public List<Task> getTasks() {
         return tasks;
     }
@@ -60,7 +73,8 @@ public class Assignment {
     @Override
     public String toString() {
         return "Assignment{" +
-                "tasks=" + tasks +
+                "assignmentId=" + assignmentId +
+                ", tasks=" + tasks +
                 ", workerId='" + workerId + '\'' +
                 ", date=" + date +
                 '}';
diff --git a/src/main/java/eu/openaire/urls_worker/util/AssignmentHandler.java b/src/main/java/eu/openaire/urls_worker/util/AssignmentHandler.java
index 7d73873..59ef305 100644
--- a/src/main/java/eu/openaire/urls_worker/util/AssignmentHandler.java
+++ b/src/main/java/eu/openaire/urls_worker/util/AssignmentHandler.java
@@ -48,9 +48,13 @@ public class AssignmentHandler {
             System.exit(1);
         }
 
-        logger.debug(assignmentRequest.toString());
+        //logger.debug(assignmentRequest.toString());   // DEBUG!
 
-        return assignmentRequest.getAssignment();
+        Assignment assignment = assignmentRequest.getAssignment();
+        logger.info("Assignment with id < " + assignment.getAssignmentId() + " > was received and it's ready to be processed.");
+        // TODO - Maybe create a HashSet with these IDs. It may be useful for the Worker to know and report which assignments (and how many) it has processed.
+
+        return assignment;
     }