Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
TAM
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
EIP
Labrador
TAM
Commits
0e3b11c9
Commit
0e3b11c9
authored
6 months ago
by
Danae Savvidi
Browse files
Options
Downloads
Patches
Plain Diff
small fixes
parent
b51b89e7
Branches
Branches containing commit
No related tags found
1 merge request
!419
Resolve "Create an organisation entity"
Pipeline
#1236233
passed
6 months ago
Stage: build
Stage: static analysis
Stage: test
Stage: report
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/nl/tudelft/tam/model/Organisation.java
+3
-0
3 additions, 0 deletions
src/main/java/nl/tudelft/tam/model/Organisation.java
src/test/java/nl/tudelft/tam/service/ProgramServiceTest.java
+19
-19
19 additions, 19 deletions
src/test/java/nl/tudelft/tam/service/ProgramServiceTest.java
with
22 additions
and
19 deletions
src/main/java/nl/tudelft/tam/model/Organisation.java
+
3
−
0
View file @
0e3b11c9
...
@@ -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
<>();
}
}
This diff is collapsed.
Click to expand it.
src/test/java/nl/tudelft/tam/service/ProgramServiceTest.java
+
19
−
19
View file @
0e3b11c9
...
@@ -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);
}
//
}
}
}
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment