Finally can save iid

fda-identifier-service/rest-service/src/test/java/at/tuwien/service/IdentifierServiceIntegrationTest.java

@@ -123,8 +123,6 @@ public class IdentifierServiceIntegrationTest extends BaseUnitTest {
         assertEquals(IDENTIFIER_2_TITLE, response.getTitle());
         assertEquals(IDENTIFIER_2_DESCRIPTION, response.getDescription());
         assertEquals(2, response.getCreators().size());
-        assertEquals(1, response.getRelatedIdentifiers().size());
-        assertEquals(IDENTIFIER_2_ID, response.getRelatedIdentifiers().get(0).getIdentifier().getId());
     }
 
     @Test

fda-identifier-service/services/src/main/java/at/tuwien/repository/jpa/RelatedIdentifierRepository.java

+package at.tuwien.repository.jpa;
+
+import at.tuwien.entities.identifier.RelatedIdentifier;
+import at.tuwien.entities.identifier.RelatedIdentifierKey;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface RelatedIdentifierRepository extends JpaRepository<RelatedIdentifier, RelatedIdentifierKey> {
+
+}

fda-identifier-service/services/src/main/java/at/tuwien/service/impl/IdentifierServiceImpl.java

@@ -16,6 +16,7 @@ import at.tuwien.gateway.QueryServiceGateway;
 import at.tuwien.mapper.DocumentMapper;
 import at.tuwien.mapper.IdentifierMapper;
 import at.tuwien.repository.jpa.IdentifierRepository;
+import at.tuwien.repository.jpa.RelatedIdentifierRepository;
 import at.tuwien.service.DatabaseService;
 import at.tuwien.service.IdentifierService;
 import at.tuwien.service.UserService;
@@ -39,16 +40,19 @@ public class IdentifierServiceImpl implements IdentifierService {
     private final IdentifierMapper identifierMapper;
     private final QueryServiceGateway queryServiceGateway;
     private final IdentifierRepository identifierRepository;
+    private final RelatedIdentifierRepository relatedIdentifierRepository;
 
     public IdentifierServiceImpl(UserService userService, DocumentMapper documentMapper,
                                  DatabaseService databaseService, IdentifierMapper identifierMapper,
-                                 QueryServiceGateway queryServiceGateway, IdentifierRepository identifierRepository) {
+                                 QueryServiceGateway queryServiceGateway, IdentifierRepository identifierRepository,
+                                 RelatedIdentifierRepository relatedIdentifierRepository) {
         this.userService = userService;
         this.documentMapper = documentMapper;
         this.databaseService = databaseService;
         this.identifierMapper = identifierMapper;
         this.queryServiceGateway = queryServiceGateway;
         this.identifierRepository = identifierRepository;
+        this.relatedIdentifierRepository = relatedIdentifierRepository;
     }
 
     @Override
@@ -114,15 +118,13 @@ public class IdentifierServiceImpl implements IdentifierService {
                 })
                 .collect(Collectors.toList()));
         if (data.getRelatedIdentifiers() != null) {
-            entity.setRelatedIdentifiers(data.getRelatedIdentifiers()
-                    .stream()
-                    .map(r -> {
+            data.getRelatedIdentifiers()
+                    .forEach(r -> {
                         final RelatedIdentifier id = identifierMapper.relatedIdentifierCreateDtoToRelatedIdentifier(r);
-                        id.setIdentifier(entity);
+                        id.setIid(entity.getId());
                         id.setCreator(creator);
-                        return id;
-                    })
-                    .collect(Collectors.toList()));
+                        relatedIdentifierRepository.save(id);
+                    });
         }
         final Identifier identifier = identifierRepository.save(entity);
         log.info("Created identifier with id {}", identifier.getId());

fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/Identifier.java

@@ -84,9 +84,6 @@ public class Identifier {
     })
     private Database database;
 
-    @OneToMany(fetch = FetchType.LAZY, cascade = CascadeType.ALL, mappedBy = "identifier")
-    private List<RelatedIdentifier> relatedIdentifiers;
-
     @Column(nullable = false, columnDefinition = "enum('EVERYONE', 'TRUSTED', 'SELF')")
     @Enumerated(EnumType.STRING)
     private VisibilityType visibility = VisibilityType.SELF;

fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifier.java

@@ -18,15 +18,17 @@ import java.time.Instant;
 @ToString
 @AllArgsConstructor
 @NoArgsConstructor
+@IdClass(RelatedIdentifierKey.class)
 @Where(clause = "deleted is null")
+@EqualsAndHashCode(onlyExplicitlyIncluded = true)
 @EntityListeners(AuditingEntityListener.class)
-@SQLDelete(sql = "update mdb_related_identifiers set deleted = NOW() where id = ?")
-@Table(name = "mdb_related_identifiers")
+@Table(name = "mdb_related_identifiers", uniqueConstraints = {
+        @UniqueConstraint(columnNames = {"id", "iid"})
+})
 public class RelatedIdentifier {
 
     @Id
     @EqualsAndHashCode.Include
-    @ToString.Include
     @GeneratedValue(generator = "related-identifier-sequence")
     @GenericGenerator(
             name = "related-identifier-sequence",
@@ -35,6 +37,10 @@ public class RelatedIdentifier {
     )
     private Long id;
 
+    @Id
+    @EqualsAndHashCode.Include
+    private Long iid;
+
     @Column(nullable = false)
     private String value;
 
@@ -52,13 +58,6 @@ public class RelatedIdentifier {
     })
     private User creator;
 
-    @ToString.Exclude
-    @ManyToOne(fetch = FetchType.LAZY, cascade = CascadeType.ALL)
-    @JoinColumns({
-            @JoinColumn(name = "identifier_id", referencedColumnName = "id")
-    })
-    private Identifier identifier;
-
     @Column(nullable = false, updatable = false)
     @CreatedDate
     private Instant created;

fda-metadata-db/entities/src/main/java/at/tuwien/entities/identifier/RelatedIdentifierKey.java

+package at.tuwien.entities.identifier;
+
+import lombok.EqualsAndHashCode;
+
+import java.io.Serializable;
+
+@EqualsAndHashCode
+public class RelatedIdentifierKey implements Serializable {
+
+    private Long id;
+
+    private Long iid;
+
+}

fda-metadata-db/setup-schema.sql

@@ -478,7 +478,7 @@ CREATE TABLE IF NOT EXISTS mdb_identifiers
 CREATE TABLE IF NOT EXISTS mdb_related_identifiers
 (
     id            bigint                               DEFAULT nextval('mdb_related_identifiers_seq'),
-    identifier_id bigint                      NOT NULL,
+    iid           bigint                      NOT NULL,
     value         text                        NOT NULL,
     type          varchar(255),
     relation      varchar(255),
@@ -486,8 +486,8 @@ CREATE TABLE IF NOT EXISTS mdb_related_identifiers
     created_by    bigint                      NOT NULL,
     last_modified timestamp without time zone,
     deleted       timestamp without time zone,
-    PRIMARY KEY (id), /* must be a single id from persistent identifier concept */
-    FOREIGN KEY (identifier_id) REFERENCES mdb_identifiers (id),
+    PRIMARY KEY (id, iid), /* must be a single id from persistent identifier concept */
+    FOREIGN KEY (iid) REFERENCES mdb_identifiers (id),
     FOREIGN KEY (created_by) REFERENCES mdb_users (UserID)
 );