tip

BerryCloud · Aug 8, 2023 · 10520e3 · 10520e3
1 parent 1e7fb0c
commit 10520e3
Show file tree

Hide file tree

Showing 3 changed files with 53 additions and 3 deletions.
diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java b/xapi-model/src/main/java/dev/learning/xapi/model/Agent.java
@@ -6,10 +6,12 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
+import lombok.AllArgsConstructor;
 import lombok.EqualsAndHashCode;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 import lombok.ToString;
+import lombok.With;
 import lombok.experimental.SuperBuilder;
 
 /**
@@ -19,9 +21,11 @@
  *
  * @see <a href="https://github.com/adlnet/xAPI-Spec/blob/master/xAPI-Data.md#agent">xAPI Agent</a>
  */
+@With
 @Getter
 @SuperBuilder
 @NoArgsConstructor
+@AllArgsConstructor
 @EqualsAndHashCode(callSuper = true)
 @ToString(callSuper = true)
 @JsonIgnoreProperties(value = {"firstName", "lastName"})

diff --git a/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java b/xapi-model/src/main/java/dev/learning/xapi/model/Statement.java
@@ -329,9 +329,7 @@ public Builder agentAuthority(Consumer<Agent.Builder<?, ?>> authority) {
     public Builder object(StatementObject object) {
 
       if (object instanceof final Agent agent && AgentObjectType.AGENT != agent.getObjectType()) {
-        this.object = Agent.builder().objectType(AgentObjectType.AGENT).name(agent.getName())
-            .account(agent.getAccount()).mbox(agent.getMbox()).mboxSha1sum(agent.getMboxSha1sum())
-            .openid(agent.getOpenid()).build();
+        this.object = agent.withObjectType(AgentObjectType.AGENT);
       } else {
         this.object = object;
       }

diff --git a/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java b/xapi-model/src/test/java/dev/learning/xapi/model/StatementTests.java
@@ -24,6 +24,7 @@
 import dev.learning.xapi.jackson.XapiStrictNullValuesModule;
 import dev.learning.xapi.jackson.XapiStrictObjectTypeModule;
 import dev.learning.xapi.jackson.XapiStrictTimestampModule;
+import dev.learning.xapi.model.Agent.AgentObjectType;
 import io.jsonwebtoken.Jwts;
 import jakarta.validation.ConstraintViolation;
 import jakarta.validation.Validation;
@@ -1685,4 +1686,51 @@ void whenSigningStatementThenSignatureIsValid()
     assertThat(bodyStatement, is(statement));
 
   }
+
+
+
+  @Test
+  void whenBuildingStatementWithAgentObjectWithoutObjectTypeThenStatementObjectObjectTypeIsNotNull() {
+
+    final Agent agent = Agent.builder().name("A N Other").objectType(null).build();
+
+    // When Building Statement With Agent Object Without ObjectType
+    final var statement = Statement.builder()
+
+        .agentActor(a -> a.name("A N Other"))
+
+        .verb(Verb.PASSED)
+
+        .object(agent)
+
+        .build();
+
+    // Then Statement Object ObjectType Is Not Null
+    assertThat(((Agent) statement.getObject()).getObjectType(), is(notNullValue()));
+
+  }
+
+  @Test
+  void whenBuildingStatementWithAgentObjectWithObjectTypeThenStatementObjectObjectTypeIsNotNull() {
+
+    final Agent agent = Agent.builder().name("A N Other").objectType(AgentObjectType.AGENT).build();
+
+    // When Building Statement With Agent Object With ObjectType
+    final var statement = Statement.builder()
+
+        .agentActor(a -> a.name("A N Other"))
+
+        .verb(Verb.PASSED)
+
+        .object(agent)
+
+        .build();
+
+    System.out.print(((Agent) statement.getObject()).getObjectType());
+
+    // Then Statement Object ObjectType Is Not Null
+    assertThat(((Agent) statement.getObject()).getObjectType(), is(notNullValue()));
+
+  }
+
 }