diff --git a/server/gradlew b/server/gradlew old mode 100755 new mode 100644 diff --git a/server/src/main/java/com/usatiuk/tjv/y/server/entity/Person.java b/server/src/main/java/com/usatiuk/tjv/y/server/entity/Person.java index 7603080..3ac57f5 100644 --- a/server/src/main/java/com/usatiuk/tjv/y/server/entity/Person.java +++ b/server/src/main/java/com/usatiuk/tjv/y/server/entity/Person.java @@ -23,13 +23,22 @@ public class Person implements EntityWithId { @Column(unique = true) private String username; - + private String fullName; private String password; @OneToMany(mappedBy = "author") private Collection posts = new ArrayList<>(); + @ManyToMany + @JoinTable(name = "user_follows", + joinColumns = @JoinColumn(name = "follower"), + inverseJoinColumns = @JoinColumn(name = "followee")) + private Collection following; + + @ManyToMany(mappedBy = "following") + private Collection followers; + @Override public String getId() { return uuid; diff --git a/server/src/test/java/com/usatiuk/tjv/y/server/controller/DemoDataDbTest.java b/server/src/test/java/com/usatiuk/tjv/y/server/controller/DemoDataDbTest.java index fd74015..c86c678 100644 --- a/server/src/test/java/com/usatiuk/tjv/y/server/controller/DemoDataDbTest.java +++ b/server/src/test/java/com/usatiuk/tjv/y/server/controller/DemoDataDbTest.java @@ -44,6 +44,9 @@ public abstract class DemoDataDbTest { protected static final String person2Password = "p2p"; protected Person person2; protected TokenResponse person2Auth; + protected static final String person3Password = "p3p"; + protected Person person3; + protected TokenResponse person3Auth; protected Post post1; protected Post post2; @@ -69,7 +72,13 @@ public abstract class DemoDataDbTest { .setUsername("person2") .setFullName("Person 2") .setPassword(passwordEncoder.encode(person2Password))); - person2Auth = new TokenResponse(tokenService.generateToken(person1.getUuid())); + person2Auth = new TokenResponse(tokenService.generateToken(person2.getUuid())); + person3 = personRepository.save( + new Person() + .setUsername("person3") + .setFullName("Person 3") + .setPassword(passwordEncoder.encode(person3Password))); + person3Auth = new TokenResponse(tokenService.generateToken(person3.getUuid())); post1 = postRepository.save(new Post().setAuthor(person1).setText("post 1")); post2 = postRepository.save(new Post().setAuthor(person2).setText("post 2")); diff --git a/server/src/test/resources/junit-platform.properties b/server/src/test/resources/junit-platform.properties index 8ceb540..e69de29 100644 --- a/server/src/test/resources/junit-platform.properties +++ b/server/src/test/resources/junit-platform.properties @@ -1,3 +0,0 @@ -junit.jupiter.execution.parallel.enabled== true -junit.jupiter.execution.parallel.mode.default=concurrent -junit.jupiter.execution.parallel.mode.classes.default=concurrent \ No newline at end of file