diff --git a/pom.xml b/pom.xml index a87da4f8..576c0bd5 100644 --- a/pom.xml +++ b/pom.xml @@ -10,7 +10,7 @@ de.filefighter rest - 0.0.3-Snapshot + 0.0.3 RestApi RestApi for FileFighter diff --git a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/File.java b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/File.java index 2f536cf2..1f9a52b2 100644 --- a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/File.java +++ b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/File.java @@ -7,7 +7,7 @@ public class File extends FileSystemItem{ public File() { } - public File(long id, String name, double size, long createdByUserId, boolean isPublic, long lastUpdated, FileSystemType type, PermissionSet permissionSet) { - super(id, name, size, createdByUserId, isPublic, lastUpdated, type, permissionSet); + public File(long id, String name, double size, long createdByUserId, long lastUpdated, FileSystemType type, PermissionSet permissionSet) { + super(id, name, size, createdByUserId, lastUpdated, type, permissionSet); } } \ No newline at end of file diff --git a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItem.java b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItem.java index 3ab5619b..56caf84f 100644 --- a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItem.java +++ b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItem.java @@ -12,7 +12,6 @@ public class FileSystemItem { private String name; private double size; private long createdByUserId; //uploadedBy - private boolean isPublic; private long lastUpdated; private FileSystemType type; private PermissionSet permissionSet; @@ -20,12 +19,11 @@ public class FileSystemItem { protected FileSystemItem() { } - public FileSystemItem(long id, String name, double size, long createdByUserId, boolean isPublic, long lastUpdated, FileSystemType type, PermissionSet permissionSet) { + public FileSystemItem(long id, String name, double size, long createdByUserId, long lastUpdated, FileSystemType type, PermissionSet permissionSet) { this.id = id; this.name = name; this.size = size; this.createdByUserId = createdByUserId; - this.isPublic = isPublic; this.lastUpdated = lastUpdated; this.type = type; this.permissionSet = permissionSet; diff --git a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItemUpdate.java b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItemUpdate.java index 1e7a6d24..1110d6d3 100644 --- a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItemUpdate.java +++ b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/FileSystemItemUpdate.java @@ -10,5 +10,4 @@ public class FileSystemItemUpdate { private String name; private FileSystemType type; private double size; - private boolean isPublic; } diff --git a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/Folder.java b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/Folder.java index 65b20624..8c31aada 100644 --- a/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/Folder.java +++ b/src/main/java/de/filefighter/rest/domain/filesystem/data/dto/Folder.java @@ -9,8 +9,8 @@ public class Folder extends FileSystemItem { public Folder() { } - public Folder(long id, String name, double size, long createdByUserId, boolean isPublic, long lastUpdated, FileSystemType type, PermissionSet permissionSet, String path) { - super(id, name, size, createdByUserId, isPublic, lastUpdated, type, permissionSet); + public Folder(long id, String name, double size, long createdByUserId, long lastUpdated, FileSystemType type, PermissionSet permissionSet, String path) { + super(id, name, size, createdByUserId, lastUpdated, type, permissionSet); this.path = path; } diff --git a/src/main/java/de/filefighter/rest/domain/filesystem/data/persistance/FileSystemEntity.java b/src/main/java/de/filefighter/rest/domain/filesystem/data/persistance/FileSystemEntity.java index febd46a2..5aa37ee2 100644 --- a/src/main/java/de/filefighter/rest/domain/filesystem/data/persistance/FileSystemEntity.java +++ b/src/main/java/de/filefighter/rest/domain/filesystem/data/persistance/FileSystemEntity.java @@ -6,10 +6,12 @@ import org.springframework.data.mongodb.core.mapping.MongoId; @Data -@Document(collection = "file") +@Document(collection = "filesystem") @Builder public class FileSystemEntity { - @MongoId private String _id; + + @MongoId + private String _id; private long id; private String name; private String path; @@ -17,11 +19,11 @@ public class FileSystemEntity { private double size; private boolean isFile; private long createdByUserId; //uploadedBy - private boolean isPublic; private long lastUpdated; private long[] visibleForRoleIds; private long[] editableForRoleIds; private long[] visibleForUserIds; private long[] editableForUserIds; private long[] itemIds; + } diff --git a/src/main/java/de/filefighter/rest/domain/token/data/persistance/AccessTokenEntity.java b/src/main/java/de/filefighter/rest/domain/token/data/persistance/AccessTokenEntity.java index 3c7dea5a..8b9f6c9f 100644 --- a/src/main/java/de/filefighter/rest/domain/token/data/persistance/AccessTokenEntity.java +++ b/src/main/java/de/filefighter/rest/domain/token/data/persistance/AccessTokenEntity.java @@ -11,7 +11,7 @@ public class AccessTokenEntity { @MongoId - private String id; + private String _id; private String value; private long userId; private long validUntil; diff --git a/src/main/java/de/filefighter/rest/domain/user/data/persistance/UserEntity.java b/src/main/java/de/filefighter/rest/domain/user/data/persistance/UserEntity.java index a4604180..804b81ff 100644 --- a/src/main/java/de/filefighter/rest/domain/user/data/persistance/UserEntity.java +++ b/src/main/java/de/filefighter/rest/domain/user/data/persistance/UserEntity.java @@ -11,7 +11,7 @@ public class UserEntity { @MongoId - private String id; + private String _id; private long userId; private String username; private String password; diff --git a/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java b/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java index 10aa1686..f51b95f5 100644 --- a/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java +++ b/src/test/java/de/filefighter/rest/RestApplicationIntegrationTest.java @@ -5,13 +5,13 @@ import de.filefighter.rest.domain.permission.rest.PermissionRestController; import de.filefighter.rest.domain.user.rest.UserRestController; import org.jetbrains.annotations.NotNull; -import org.junit.jupiter.api.AfterAll; import org.junit.jupiter.api.Test; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.boot.test.context.SpringBootTest; import org.springframework.boot.web.server.LocalServerPort; import org.springframework.http.HttpMethod; import org.springframework.http.client.ClientHttpResponse; +import org.springframework.test.context.ActiveProfiles; import org.springframework.web.client.ResponseErrorHandler; import org.springframework.web.client.RestTemplate; @@ -21,6 +21,8 @@ import static org.assertj.core.api.Assertions.assertThat; +@SuppressWarnings("SameParameterValue") +@ActiveProfiles("test") @SpringBootTest(classes = RestApplication.class, webEnvironment = SpringBootTest.WebEnvironment.RANDOM_PORT) public class RestApplicationIntegrationTest {