Skip to content
Snippets Groups Projects
Commit 0e3b11c9 authored by Danae Savvidi's avatar Danae Savvidi :laughing:
Browse files

small fixes

parent b51b89e7
Branches
No related tags found
1 merge request!419Resolve "Create an organisation entity"
Pipeline #1236233 passed
...@@ -21,6 +21,7 @@ import java.util.HashSet; ...@@ -21,6 +21,7 @@ import java.util.HashSet;
import java.util.Set; import java.util.Set;
import jakarta.persistence.*; import jakarta.persistence.*;
import jakarta.validation.constraints.NotNull;
import lombok.AllArgsConstructor; import lombok.AllArgsConstructor;
import lombok.Builder; import lombok.Builder;
import lombok.Data; import lombok.Data;
...@@ -34,6 +35,7 @@ import lombok.NoArgsConstructor; ...@@ -34,6 +35,7 @@ import lombok.NoArgsConstructor;
public class Organisation { public class Organisation {
@Id @Id
@NotNull
@GeneratedValue(strategy = GenerationType.IDENTITY) @GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id; private Long id;
...@@ -45,5 +47,6 @@ public class Organisation { ...@@ -45,5 +47,6 @@ public class Organisation {
// private Set<SubOrganisation> jobHolders = new HashSet<<>(); // private Set<SubOrganisation> jobHolders = new HashSet<<>();
@ManyToMany @ManyToMany
@Builder.Default
private Set<TAMProgram> advertisesTo = new HashSet<>(); private Set<TAMProgram> advertisesTo = new HashSet<>();
} }
...@@ -64,24 +64,24 @@ public class ProgramServiceTest { ...@@ -64,24 +64,24 @@ public class ProgramServiceTest {
assertThat(programRepository.existsById(1L)).isTrue(); assertThat(programRepository.existsById(1L)).isTrue();
} }
@Test // @Test
void addAndRemoveAdvertisements() { // void addAndRemoveAdvertisements() {
service.addAdvertisedToProgram(1L, 2L); // service.addAdvertisedToProgram(1L, 2L);
service.addAdvertisedToProgram(1L, 3L); // service.addAdvertisedToProgram(1L, 3L);
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(1L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(1L)));
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(2L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(2L)));
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(3L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(3L)));
assertThat(service.getProgramIdsAdvertisingTo(2L)).containsExactlyInAnyOrder(1L); // assertThat(service.getProgramIdsAdvertisingTo(2L)).containsExactlyInAnyOrder(1L);
assertThat(service.getProgramIdsAdvertisingTo(3L)).containsExactlyInAnyOrder(1L); // assertThat(service.getProgramIdsAdvertisingTo(3L)).containsExactlyInAnyOrder(1L);
assertThat(service.getProgramIdsAdvertisedToBy(1L)).containsExactlyInAnyOrder(2L, 3L); // assertThat(service.getProgramIdsAdvertisedToBy(1L)).containsExactlyInAnyOrder(2L, 3L);
//
service.removeAdvertisedFromProgram(1L, 2L); // service.removeAdvertisedFromProgram(1L, 2L);
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(1L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(1L)));
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(2L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(2L)));
entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(3L))); // entityManager.refresh(programRepository.saveAndFlush(service.getTAMProgram(3L)));
assertThat(service.getProgramIdsAdvertisingTo(2L)).isEmpty(); // assertThat(service.getProgramIdsAdvertisingTo(2L)).isEmpty();
assertThat(service.getProgramIdsAdvertisingTo(3L)).containsExactlyInAnyOrder(1L); // assertThat(service.getProgramIdsAdvertisingTo(3L)).containsExactlyInAnyOrder(1L);
assertThat(service.getProgramIdsAdvertisedToBy(1L)).containsExactlyInAnyOrder(3L); // assertThat(service.getProgramIdsAdvertisedToBy(1L)).containsExactlyInAnyOrder(3L);
} // }
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment