Feat/support for networks

src/main/java/eu/bbmri_eric/negotiator/database/model/Network.java

@@ -0,0 +1,134 @@
+package eu.bbmri_eric.negotiator.database.model;
+
+import jakarta.persistence.CascadeType;
+import jakarta.persistence.Column;
+import jakarta.persistence.Entity;
+import jakarta.persistence.FetchType;
+import jakarta.persistence.GeneratedValue;
+import jakarta.persistence.GenerationType;
+import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.JoinTable;
+import jakarta.persistence.ManyToMany;
+import jakarta.persistence.SequenceGenerator;
+import jakarta.validation.constraints.NotNull;
+import java.util.Collections;
+import java.util.HashSet;
+import java.util.Objects;
+import java.util.Set;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.Setter;
+import lombok.ToString.Exclude;
+
+/**
+ * Represents a Network entity in the database. A Network has a unique identifier, a URI, a name, a
+ * contact email, a set of managers, and a set of resources.
+ */
+@Getter
+@Setter
+@Entity
+@Builder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class Network {
+
+  @Id
+  @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "network_id_seq")
+  @SequenceGenerator(name = "network_id_seq", initialValue = 10000, allocationSize = 1)
+  private Long id;
+
+  /** The URI of the network */
+  @NotNull private String uri;
+
+  /** The name of the network */
+  @Column(unique = true)
+  private String name;
+
+  /** A unique and persistent identifier issued by an appropriate institution */
+  @NotNull
+  @Column(unique = true)
+  private String externalId;
+
+  /** The contact email of the network. */
+  private String contactEmail;
+
+  /** The managers of the network. */
+  @ManyToMany(mappedBy = "networks")
+  @Exclude
+  @Setter(AccessLevel.NONE)
+  @Builder.Default
+  private Set<Person> managers = new HashSet<>();
+
+  /** The resources of the network. */
+  @ManyToMany(
+      cascade = {CascadeType.PERSIST, CascadeType.MERGE},
+      fetch = FetchType.LAZY)
+  @JoinTable(
+      name = "network_resources_link",
+      joinColumns = @JoinColumn(name = "network_id"),
+      inverseJoinColumns = @JoinColumn(name = "resource_id"))
+  @Builder.Default
+  @Exclude
+  @Setter(AccessLevel.NONE)
+  private Set<Resource> resources = new HashSet<>();
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) return true;
+    if (o == null || getClass() != o.getClass()) return false;
+    Network that = (Network) o;
+    return Objects.equals(externalId, that.externalId)
+        && Objects.equals(id, that.id)
+        && Objects.equals(uri, that.uri)
+        && Objects.equals(name, that.name)
+        && Objects.equals(contactEmail, that.contactEmail);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(externalId, id, uri, name, contactEmail);
+  }
+
+  /** Adds a resource to the network. */
+  public void addResource(Resource collection) {
+    resources.add(collection);
+    collection.getNetworks().add(this);
+  }
+
+  /** Removes a resource from the network. */
+  public void removeResource(Resource collection) {
+    resources.remove(collection);
+    collection.getNetworks().remove(this);
+  }
+
+  /** Returns all resources in the network. */
+  public Set<Resource> getResources() {
+    if (Objects.isNull(this.resources)) {
+      return Set.of();
+    }
+    return Collections.unmodifiableSet(this.resources);
+  }
+
+  /** Adds a manager to the network. */
+  public void addManager(Person manager) {
+    managers.add(manager);
+    manager.getNetworks().add(this);
+  }
+
+  /** Removes a manager from the network. */
+  public void removeManager(Person manager) {
+    managers.remove(manager);
+    manager.getNetworks().remove(this);
+  }
+
+  public Set<Person> getManagers() {
+    if (Objects.isNull(this.managers)) {
+      return Set.of();
+    }
+    return Collections.unmodifiableSet(this.managers);
+  }
+}

src/main/java/eu/bbmri_eric/negotiator/database/model/Person.java

@@ -1,5 +1,6 @@
 package eu.bbmri_eric.negotiator.database.model;
 
+import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.FetchType;
@@ -19,6 +20,7 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -78,6 +80,15 @@ public class Person {
   @OneToMany(fetch = FetchType.LAZY, mappedBy = "person")
   private Set<Authority> authorities;
 
+  @ManyToMany(cascade = {CascadeType.PERSIST, CascadeType.MERGE})
+  @JoinTable(
+      name = "network_person_link",
+      joinColumns = @JoinColumn(name = "network_id"),
+      inverseJoinColumns = @JoinColumn(name = "person_id"))
+  @Exclude
+  @Setter(AccessLevel.NONE)
+  private Set<Network> networks;
+
   public void addResource(Resource resource) {
     this.resources.add(resource);
     resource.getRepresentatives().add(this);

src/main/java/eu/bbmri_eric/negotiator/database/model/Resource.java

@@ -16,6 +16,7 @@
 import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
+import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Getter;
@@ -71,6 +72,11 @@ public class Resource {
   @Exclude
   private AccessForm accessForm;
 
+  @ManyToMany(mappedBy = "resources")
+  @Builder.Default
+  @Setter(AccessLevel.NONE)
+  private Set<Network> networks = new HashSet<>();
+
   @Override
   public boolean equals(Object o) {
     if (this == o) return true;

src/main/java/eu/bbmri_eric/negotiator/database/repository/NetworkRepository.java

@@ -0,0 +1,15 @@
+package eu.bbmri_eric.negotiator.database.repository;
+
+import eu.bbmri_eric.negotiator.database.model.Network;
+import jakarta.validation.constraints.NotNull;
+import java.util.Optional;
+import org.springframework.data.jpa.repository.JpaRepository;
+
+public interface NetworkRepository extends JpaRepository<Network, Long> {
+
+  Optional<Network> findByExternalId(String externalId);
+
+  boolean existsByExternalId(@NotNull String externalId);
+
+  boolean existsByUri(@NotNull String uri);
+}

src/main/java/eu/bbmri_eric/negotiator/service/UserNotificationServiceImpl.java

@@ -3,16 +3,30 @@
 import eu.bbmri_eric.negotiator.configuration.state_machine.negotiation.NegotiationState;
 import eu.bbmri_eric.negotiator.configuration.state_machine.resource.NegotiationResourceEvent;
 import eu.bbmri_eric.negotiator.configuration.state_machine.resource.NegotiationResourceState;
-import eu.bbmri_eric.negotiator.database.model.*;
 import eu.bbmri_eric.negotiator.database.model.Negotiation;
+import eu.bbmri_eric.negotiator.database.model.NegotiationResourceLifecycleRecord;
+import eu.bbmri_eric.negotiator.database.model.Notification;
+import eu.bbmri_eric.negotiator.database.model.NotificationEmailStatus;
+import eu.bbmri_eric.negotiator.database.model.Person;
+import eu.bbmri_eric.negotiator.database.model.Post;
+import eu.bbmri_eric.negotiator.database.model.Resource;
 import eu.bbmri_eric.negotiator.database.repository.NegotiationRepository;
 import eu.bbmri_eric.negotiator.database.repository.NotificationRepository;
 import eu.bbmri_eric.negotiator.database.repository.PersonRepository;
 import eu.bbmri_eric.negotiator.dto.NotificationDTO;
 import jakarta.transaction.Transactional;
 import java.time.Duration;
 import java.time.LocalDateTime;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+import java.util.Set;
 import java.util.stream.Collectors;
 import lombok.NonNull;
 import lombok.extern.apachecommons.CommonsLog;

src/main/resources/db/migration/postgresql/V6__Add_networks.sql

@@ -0,0 +1,44 @@
+CREATE TABLE network
+(
+    id            BIGINT       NOT NULL,
+    uri           VARCHAR(255) NOT NULL,
+    name          VARCHAR(255),
+    external_id   VARCHAR(255) NOT NULL,
+    contact_email VARCHAR(255),
+    CONSTRAINT pk_network PRIMARY KEY (id)
+);
+
+
+ALTER TABLE network
+    ADD CONSTRAINT uc_network_externalid UNIQUE (external_id);
+
+ALTER TABLE network
+    ADD CONSTRAINT uc_network_name UNIQUE (name);
+
+
+CREATE TABLE network_resources_link
+(
+    network_id  BIGINT NOT NULL,
+    resource_id BIGINT NOT NULL,
+    CONSTRAINT pk_network_resources_link PRIMARY KEY (network_id, resource_id)
+);
+
+ALTER TABLE network_resources_link
+    ADD CONSTRAINT fk_netres_on_network FOREIGN KEY (network_id) REFERENCES network (id);
+
+ALTER TABLE network_resources_link
+    ADD CONSTRAINT fk_netres_on_resource FOREIGN KEY (resource_id) REFERENCES resource (id);
+
+CREATE TABLE network_person_link
+(
+    network_id  BIGINT NOT NULL,
+    person_id BIGINT NOT NULL,
+    CONSTRAINT pk_network_person_link PRIMARY KEY (network_id, person_id)
+);
+
+ALTER TABLE network_person_link
+    ADD CONSTRAINT fk_netper_on_network FOREIGN KEY (network_id) REFERENCES network (id);
+
+ALTER TABLE network_person_link
+    ADD CONSTRAINT fk_netper_on_person FOREIGN KEY (person_id) REFERENCES person (id);
+