Skip to content
Snippets Groups Projects
Commit 8be84589 authored by Martin Weise's avatar Martin Weise
Browse files

Merge branch 'bugfix/connect-frontend-backend' into 89-zenodo-sandbox-integration-for-pid-e-g-doi

parents 96ee52b8 0992cb74
No related branches found
No related tags found
4 merge requests!81New stable release,!43Merge dev to master,!27Draft: Resolve "Zenodo Sandbox integration for PID (e.g. DOI)",!26Draft: Resolve "Task: Prepare tests for Sprint 2 Milestone"
Showing
with 153 additions and 46 deletions
...@@ -6,22 +6,11 @@ ...@@ -6,22 +6,11 @@
## Build ## Build
Everything is handled by Docker Compose, just build it by executing: Everything is handled by compose, just build it by running:
```bash ```bash
docker-compose build docker-compose build
``` ```
## Start
After build, the system can be started by executing:
```bash
docker-compose up -d
```
## Development
Local development minimum requirements: Local development minimum requirements:
- Ubuntu 18.04 LTS (RPM-based operating systems are also tested) - Ubuntu 18.04 LTS (RPM-based operating systems are also tested)
...@@ -53,7 +42,9 @@ Local deployment minimum versions: ...@@ -53,7 +42,9 @@ Local deployment minimum versions:
- Docker Engine 20.10.0 - Docker Engine 20.10.0
- Docker Compose 1.28.0 - Docker Compose 1.28.0
# Contribute ## Deployment
The pipeline is set-up to build and test all commits. A commit to dev or master branch triggers additional jobs.
Contributions are always welcome and encouraged, simply fork the repository and Contributions are always welcome and encouraged, simply fork the repository and
contact [Andreas Rauber](http://www.ifs.tuwien.ac.at/~andi/). contact [Andreas Rauber](http://www.ifs.tuwien.ac.at/~andi/).
......
...@@ -204,6 +204,20 @@ services: ...@@ -204,6 +204,20 @@ services:
volumes: volumes:
- fda-broker-service-data:/var/lib/rabbitmq/ - fda-broker-service-data:/var/lib/rabbitmq/
fda-search-service:
restart: always
container_name: fda-search-service
hostname: fda-search-service
image: elasticsearch:7.13.4
networks:
- fda-public
environment:
- discovery.type=single-node
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
ports:
- 9200:9200
- 9600:9600
fda-ui: fda-ui:
restart: on-failure restart: on-failure
container_name: fda-ui container_name: fda-ui
......
int;float;boolean;date;text
1;0.82415839;0;02.12.1954;randomtext 1
2;0.788147281;1;06.01.1960;randomtext 2
3;0.068557598;0;04.09.1993;randomtext 3
4;0.005052854;0;20.10.1940;randomtext 4
5;0.971539207;0;25.05.1946;randomtext 5
6;0.488228578;1;23.08.1966;randomtext 6
7;0.878776634;0;15.01.1942;randomtext 7
8;0.612717543;0;10.03.1977;randomtext 8
9;0.507138264;0;09.01.2016;randomtext 9
10;0.385006604;0;17.11.1957;randomtext 10
11;0.869954028;1;17.09.1920;randomtext 11
12;0.65316011;1;08.10.1953;randomtext 12
13;0.347915127;1;02.04.2017;randomtext 13
14;0.834978914;0;21.10.1938;randomtext 14
15;0.233222738;0;22.11.1954;randomtext 15
16;0.948783514;0;31.05.1940;randomtext 16
17;0.795264559;0;22.10.1926;randomtext 17
18;0.593620632;0;06.12.1981;randomtext 18
19;0.410701869;0;30.06.2009;randomtext 19
int;float;boolean;time;text
1;0.82415839;0;3:01 PM;randomtext 1
2;0.788147281;1;11:57 AM;randomtext 2
3;0.068557598;0;2:20 PM;randomtext 3
4;0.005052854;0;11:50 AM;randomtext 4
5;0.971539207;0;7:16 AM;randomtext 5
6;0.488228578;1;5:29 PM;randomtext 6
7;0.878776634;0;4:55 AM;randomtext 7
8;0.612717543;0;12:33 PM;randomtext 8
9;0.507138264;0;10:23 AM;randomtext 9
10;0.385006604;0;12:45 AM;randomtext 10
11;0.869954028;1;4:44 AM;randomtext 11
12;0.65316011;1;2:47 PM;randomtext 12
13;0.347915127;1;4:42 PM;randomtext 13
14;0.834978914;0;1:37 PM;randomtext 14
15;0.233222738;0;2:11 AM;randomtext 15
16;0.948783514;0;3:19 AM;randomtext 16
17;0.795264559;0;11:55 PM;randomtext 17
18;0.593620632;0;1:13 AM;randomtext 18
19;0.410701869;0;8:24 AM;randomtext 19
int;float;boolean;time;text
1;0.005;0;01.01.1900 03:05;randomtext 1
2;0.126;1;01.01.1900 09:49;randomtext 2
3;0.213;0;01.01.1900 07:15;randomtext 3
4;0.7896;0;02.01.1900 07:15;randomtext 4
5;0.2158;0;03.01.1900 07:15;randomtext 5
6;0.2157;1;04.01.1900 07:15;randomtext 6
7;0.9543;0;05.01.1900 07:15;randomtext 7
8;0.965;0;06.01.1900 07:15;randomtext 8
9;0.2458;0;07.01.1900 07:15;randomtext 9
10;0.1245;0;08.01.1900 07:15;randomtext 10
11;0.147;1;09.01.1900 07:15;randomtext 11
12;0.546;1;10.01.1900 07:15;randomtext 12
13;0.1578;1;11.01.1900 07:15;randomtext 13
14;0.753;0;12.01.1900 07:15;randomtext 14
15;0.159;0;13.01.1900 07:15;randomtext 15
16;0.675;0;14.01.1900 07:15;randomtext 16
17;0.3782;0;15.01.1900 07:15;randomtext 17
18;0.684;0;16.01.1900 07:15;randomtext 18
19;0.498;0;17.01.1900 07:15;randomtext 19
int;float;boolean;time;text
1;0.005;0;2020-10-17 00:00;randomtext 1
2;0.126;1;2020-10-06 00:00;randomtext 2
3;0.213;0;2020-10-24 00:00;randomtext 3
4;0.7896;0;2020-10-09 00:00;randomtext 4
5;0.2158;0;2020-09-30 00:00;randomtext 5
6;0.2157;1;2020-10-10 00:00;randomtext 6
7;0.9543;0;2020-10-07 00:00;randomtext 7
8;0.965;0;2020-10-23 00:00;randomtext 8
9;0.2458;0;2020-10-24 00:00;randomtext 9
10;0.1245;0;2020-10-25 00:00;randomtext 10
11;0.147;1;2020-10-14 00:00;randomtext 11
12;0.546;1;2020-10-18 00:00;randomtext 12
13;0.1578;1;2020-10-19 00:00;randomtext 13
14;0.753;0;2020-10-25 00:00;randomtext 14
15;0.159;0;2020-10-02 00:00;randomtext 15
16;0.675;0;2020-10-05 00:00;randomtext 16
17;0.3782;0;2020-10-20 00:00;randomtext 17
18;0.684;0;2020-10-21 00:00;randomtext 18
19;0.498;0;2020-10-21 00:00;randomtext 19
int;float;boolean;time;enum
1;0.005;0;2020-10-17 00:00; a
2;0.126;1;2020-10-06 00:00; b
3;0.213;0;2020-10-24 00:00; c
4;0.7896;0;2020-10-09 00:00; a
5;0.2158;0;2020-09-30 00:00; a
6;0.2157;1;2020-10-10 00:00; a
7;0.9543;0;2020-10-07 00:00; a
8;0.965;0;2020-10-23 00:00; b
9;0.2458;0;2020-10-24 00:00; b
10;0.1245;0;2020-10-25 00:00; b
11;0.147;1;2020-10-14 00:00; b
12;0.546;1;2020-10-18 00:00; b
13;0.1578;1;2020-10-19 00:00; c
14;0.753;0;2020-10-25 00:00; c
15;0.159;0;2020-10-02 00:00; a
16;0.675;0;2020-10-05 00:00; a
17;0.3782;0;2020-10-20 00:00; a
18;0.684;0;2020-10-21 00:00; a
19;0.498;0;2020-10-21 00:00; a
...@@ -4,6 +4,9 @@ target/ ...@@ -4,6 +4,9 @@ target/
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
### Generated ###
ready
### STS ### ### STS ###
.apt_generated .apt_generated
.classpath .classpath
......
...@@ -56,6 +56,10 @@ ...@@ -56,6 +56,10 @@
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-data-jpa</artifactId> <artifactId>spring-boot-starter-data-jpa</artifactId>
</dependency> </dependency>
<dependency>
<groupId>org.springframework.data</groupId>
<artifactId>spring-data-elasticsearch</artifactId>
</dependency>
<!-- Entity and API --> <!-- Entity and API -->
<dependency> <dependency>
<groupId>at.tuwien</groupId> <groupId>at.tuwien</groupId>
......
...@@ -3,6 +3,7 @@ package at.tuwien; ...@@ -3,6 +3,7 @@ package at.tuwien;
import org.springframework.boot.SpringApplication; import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication; import org.springframework.boot.autoconfigure.SpringBootApplication;
import org.springframework.boot.autoconfigure.domain.EntityScan; import org.springframework.boot.autoconfigure.domain.EntityScan;
import org.springframework.data.elasticsearch.repository.config.EnableElasticsearchRepositories;
import org.springframework.data.jpa.repository.config.EnableJpaAuditing; import org.springframework.data.jpa.repository.config.EnableJpaAuditing;
import org.springframework.data.jpa.repository.config.EnableJpaRepositories; import org.springframework.data.jpa.repository.config.EnableJpaRepositories;
import springfox.documentation.oas.annotations.EnableOpenApi; import springfox.documentation.oas.annotations.EnableOpenApi;
...@@ -10,7 +11,8 @@ import springfox.documentation.oas.annotations.EnableOpenApi; ...@@ -10,7 +11,8 @@ import springfox.documentation.oas.annotations.EnableOpenApi;
@SpringBootApplication @SpringBootApplication
@EnableJpaAuditing @EnableJpaAuditing
@EnableOpenApi @EnableOpenApi
@EnableJpaRepositories(basePackages = {"at.tuwien.repository"}) @EnableElasticsearchRepositories(basePackages = {"at.tuwien.repository.elastic"})
@EnableJpaRepositories(basePackages = {"at.tuwien.repository.jpa"})
@EntityScan(basePackages = {"at.tuwien.entities"}) @EntityScan(basePackages = {"at.tuwien.entities"})
public class FdaContainerManagingApplication { public class FdaContainerManagingApplication {
......
...@@ -5,7 +5,7 @@ import at.tuwien.api.container.*; ...@@ -5,7 +5,7 @@ import at.tuwien.api.container.*;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.endpoints.ContainerEndpoint; import at.tuwien.endpoints.ContainerEndpoint;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.service.ContainerService; import at.tuwien.service.ContainerService;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import org.junit.jupiter.api.Disabled; import org.junit.jupiter.api.Disabled;
......
...@@ -6,8 +6,8 @@ import at.tuwien.api.container.ContainerStateDto; ...@@ -6,8 +6,8 @@ import at.tuwien.api.container.ContainerStateDto;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container; import at.tuwien.entities.container.Container;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.exception.NotModifiedException; import com.github.dockerjava.api.exception.NotModifiedException;
...@@ -24,7 +24,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension; ...@@ -24,7 +24,6 @@ import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.Arrays; import java.util.Arrays;
import java.util.List;
import java.util.Map; import java.util.Map;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
......
...@@ -8,8 +8,8 @@ import at.tuwien.exception.ContainerNotFoundException; ...@@ -8,8 +8,8 @@ import at.tuwien.exception.ContainerNotFoundException;
import at.tuwien.exception.ContainerStillRunningException; import at.tuwien.exception.ContainerStillRunningException;
import at.tuwien.exception.DockerClientException; import at.tuwien.exception.DockerClientException;
import at.tuwien.exception.ImageNotFoundException; import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.exception.ConflictException; import com.github.dockerjava.api.exception.ConflictException;
import com.github.dockerjava.api.exception.NotFoundException; import com.github.dockerjava.api.exception.NotFoundException;
......
...@@ -3,10 +3,9 @@ package at.tuwien.service; ...@@ -3,10 +3,9 @@ package at.tuwien.service;
import at.tuwien.BaseUnitTest; import at.tuwien.BaseUnitTest;
import at.tuwien.api.container.image.ImageCreateDto; import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import lombok.extern.log4j.Log4j2; import lombok.extern.log4j.Log4j2;
import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
...@@ -18,8 +17,6 @@ import org.springframework.test.annotation.DirtiesContext; ...@@ -18,8 +17,6 @@ import org.springframework.test.annotation.DirtiesContext;
import org.springframework.test.context.junit.jupiter.SpringExtension; import org.springframework.test.context.junit.jupiter.SpringExtension;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.util.stream.Collectors;
import static org.junit.jupiter.api.Assertions.*; import static org.junit.jupiter.api.Assertions.*;
@Log4j2 @Log4j2
......
package at.tuwien.service; package at.tuwien.service;
import at.tuwien.BaseUnitTest; import at.tuwien.BaseUnitTest;
import at.tuwien.api.container.ContainerCreateRequestDto;
import at.tuwien.api.container.image.ImageChangeDto; import at.tuwien.api.container.image.ImageChangeDto;
import at.tuwien.api.container.image.ImageCreateDto; import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.api.container.image.ImageEnvItemDto; import at.tuwien.api.container.image.ImageEnvItemDto;
import at.tuwien.config.ReadyConfig; import at.tuwien.config.ReadyConfig;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ImageRepository;
import at.tuwien.repository.ImageRepository;
import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.exception.ConflictException;
import com.github.dockerjava.api.exception.NotFoundException;
import com.github.dockerjava.api.exception.NotModifiedException;
import org.junit.jupiter.api.Disabled;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.ExtendWith; import org.junit.jupiter.api.extension.ExtendWith;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
......
package at.tuwien.repository.elastic;
import at.tuwien.entities.database.Database;
import org.springframework.data.elasticsearch.repository.ElasticsearchRepository;
import org.springframework.stereotype.Repository;
@Repository(value = "ElasticDatabaseService")
public interface DatabaseRepository extends ElasticsearchRepository<Database, Long> {
}
\ No newline at end of file
package at.tuwien.repository; package at.tuwien.repository.jpa;
import at.tuwien.entities.container.Container; import at.tuwien.entities.container.Container;
import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.container.image.ContainerImage;
......
package at.tuwien.repository; package at.tuwien.repository.jpa;
import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.container.image.ContainerImage;
import org.springframework.data.jpa.repository.JpaRepository; import org.springframework.data.jpa.repository.JpaRepository;
......
...@@ -9,8 +9,8 @@ import at.tuwien.entities.container.image.ContainerImage; ...@@ -9,8 +9,8 @@ import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.*; import at.tuwien.exception.*;
import at.tuwien.mapper.ContainerMapper; import at.tuwien.mapper.ContainerMapper;
import at.tuwien.mapper.ImageMapper; import at.tuwien.mapper.ImageMapper;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.command.CreateContainerResponse; import com.github.dockerjava.api.command.CreateContainerResponse;
import com.github.dockerjava.api.command.InspectContainerResponse; import com.github.dockerjava.api.command.InspectContainerResponse;
...@@ -27,8 +27,6 @@ import org.springframework.util.SocketUtils; ...@@ -27,8 +27,6 @@ import org.springframework.util.SocketUtils;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import java.io.IOException;
import java.net.*;
import java.time.Instant; import java.time.Instant;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;
......
...@@ -2,15 +2,14 @@ package at.tuwien.service; ...@@ -2,15 +2,14 @@ package at.tuwien.service;
import at.tuwien.api.container.image.ImageChangeDto; import at.tuwien.api.container.image.ImageChangeDto;
import at.tuwien.api.container.image.ImageCreateDto; import at.tuwien.api.container.image.ImageCreateDto;
import at.tuwien.entities.container.Container;
import at.tuwien.entities.container.image.ContainerImage; import at.tuwien.entities.container.image.ContainerImage;
import at.tuwien.exception.DockerClientException; import at.tuwien.exception.DockerClientException;
import at.tuwien.exception.ImageAlreadyExistsException; import at.tuwien.exception.ImageAlreadyExistsException;
import at.tuwien.exception.ImageNotFoundException; import at.tuwien.exception.ImageNotFoundException;
import at.tuwien.exception.PersistenceException; import at.tuwien.exception.PersistenceException;
import at.tuwien.mapper.ImageMapper; import at.tuwien.mapper.ImageMapper;
import at.tuwien.repository.ContainerRepository; import at.tuwien.repository.jpa.ContainerRepository;
import at.tuwien.repository.ImageRepository; import at.tuwien.repository.jpa.ImageRepository;
import com.github.dockerjava.api.DockerClient; import com.github.dockerjava.api.DockerClient;
import com.github.dockerjava.api.async.ResultCallback; import com.github.dockerjava.api.async.ResultCallback;
import com.github.dockerjava.api.command.InspectImageResponse; import com.github.dockerjava.api.command.InspectImageResponse;
...@@ -25,7 +24,6 @@ import org.springframework.stereotype.Service; ...@@ -25,7 +24,6 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional; import org.springframework.transaction.annotation.Transactional;
import javax.persistence.EntityNotFoundException; import javax.persistence.EntityNotFoundException;
import javax.persistence.Persistence;
import javax.validation.ConstraintViolationException; import javax.validation.ConstraintViolationException;
import java.time.Duration; import java.time.Duration;
import java.time.Instant; import java.time.Instant;
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment