fix endorsement test

Real-Dev-Squad · May 5, 2024 · 7ada796 · 7ada796
1 parent 4b9ba65
commit 7ada796
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 10 deletions.
diff --git a/skill-tree/skill-tree.iml b/skill-tree/skill-tree.iml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4">
+  <component name="SonarLintModuleSettings">
+    <option name="uniqueId" value="f8bc8917-36fa-4978-8139-92d76bd84646" />
+  </component>
+</module>
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementRepository.java b/skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementRepository.java
@@ -7,7 +7,7 @@
 
 @Repository
 public interface EndorsementRepository extends JpaRepository<EndorsementModel, UUID> {
-    List<EndorsementModel> findByUserId(UUID userId);
+    List<EndorsementModel> findByEndorserId(UUID userId);
 
     List<EndorsementModel> findBySkillId(UUID skillId);
 }
diff --git a/skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementServiceImpl.java b/skill-tree/src/main/java/com/RDS/skilltree/Endorsement/EndorsementServiceImpl.java
@@ -3,7 +3,6 @@
 import com.RDS.skilltree.Exceptions.NoEntityException;
 import com.RDS.skilltree.Skill.SkillModel;
 import com.RDS.skilltree.Skill.SkillRepository;
-import com.RDS.skilltree.User.UserRepository;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
 import jakarta.persistence.EntityNotFoundException;
@@ -26,7 +25,6 @@
 @RequiredArgsConstructor
 public class EndorsementServiceImpl implements EndorsementService {
     private final EndorsementRepository endorsementRepository;
-    private final UserRepository userRepository;
     private final SkillRepository skillRepository;
 
     private final ObjectMapper objectMapper;

diff --git a/skill-tree/src/main/java/com/RDS/skilltree/utils/TrackedProperties.java b/skill-tree/src/main/java/com/RDS/skilltree/utils/TrackedProperties.java
@@ -1,8 +1,6 @@
 package com.RDS.skilltree.utils;
 
 import jakarta.persistence.Column;
-import jakarta.persistence.JoinColumn;
-import jakarta.persistence.ManyToOne;
 import jakarta.persistence.MappedSuperclass;
 import java.time.Instant;
 import java.util.UUID;
@@ -11,12 +9,11 @@
 @Data
 @MappedSuperclass
 public abstract class TrackedProperties {
-    @ManyToOne
-    @JoinColumn(name = "created_by")
+
+    @Column(name = "created_by")
     private UUID createdBy;
 
-    @ManyToOne
-    @JoinColumn(name = "updated_by")
+    @Column(name = "updated_by")
     private UUID updatedBy;
 
     @Column(name = "created_at")

diff --git a/skill-tree/src/test/java/com/RDS/skilltree/integration/EndorsementsIntegrationTests.java b/skill-tree/src/test/java/com/RDS/skilltree/integration/EndorsementsIntegrationTests.java
@@ -172,7 +172,7 @@ public void testAPIReturns201_OnEndorsementCreation() {
                 .then()
                 .statusCode(201)
                 .contentType("application/json")
-                .body("data.user.firstName", equalTo("John"))
+                .body("data.endorserId", equalTo(endorserId.toString()))
                 .body("data.skill.name", equalTo("Java"));
     }