Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release v1.5 #49

Merged
merged 78 commits into from
Mar 11, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
78 commits
Select commit Hold shift + click to select a range
ef58933
Create README.md
ammarbarakat Aug 17, 2023
a69ee09
Create LICENSE
ammarbarakat Aug 18, 2023
ac1fa42
Update README.md
ammarbarakat Aug 18, 2023
a962f20
Update README.md
ammarbarakat Aug 18, 2023
83b0f56
#1 - Documentation Updates for OpenAPI Annotations
Aug 25, 2023
3523cb4
Merge pull request #2 from ejp-rd-vp/feature/1-Documentation-Updates-…
ammarbarakat Aug 25, 2023
9eea10d
Update README.md
ammarbarakat Aug 29, 2023
ee6c535
#3 - Update ResourceType Format
Aug 29, 2023
338689a
Merge pull request #4 from ejp-rd-vp/feature/3-Update-ResourceType-Fo…
ammarbarakat Aug 29, 2023
c863a34
no issue - add issue & pr template
Aug 29, 2023
f425143
Merge remote-tracking branch 'origin/develop' into develop
Aug 29, 2023
5a9012d
#5 - Update the Exception Handling for the Hierarchy Service
Aug 29, 2023
53384ad
Merge pull request #6 from ejp-rd-vp/feature/5-Update-the-Exception-H…
ammarbarakat Aug 29, 2023
3ec4c2c
#7 - Verify Search Filters Are Provided Before Processing Them
Aug 30, 2023
cd4eff0
Merge pull request #8 from ejp-rd-vp/feature/7-Verify-Search-Filters-…
ammarbarakat Aug 30, 2023
6e1daf3
#9 - Add unit and integration tests for mapping service
Sep 5, 2023
1ba016a
#9 - Add unit and integration tests for mapping service
Sep 5, 2023
e778d9d
Merge pull request #10 from ejp-rd-vp/feature/9-Add-unit-and-integrat…
ammarbarakat Sep 5, 2023
bc74404
#12 - Add unit and integration tests for resource service
Sep 6, 2023
da3bea0
Merge pull request #13 from ejp-rd-vp/feature/12-Add-unit-and-integra…
ammarbarakat Sep 6, 2023
86cf57f
#14 - Add unit and integration tests for resource monitoring service
Sep 11, 2023
750098c
Merge pull request #15 from ejp-rd-vp/feature/14-Add-unit-and-integra…
ammarbarakat Sep 11, 2023
c70d2e0
#16 - Use PostgreSQL instead of H2 database for test environment
Sep 12, 2023
0059895
Merge pull request #17 from ejp-rd-vp/feature/16-Use-PostgreSQL-inste…
ammarbarakat Sep 12, 2023
314178a
#11 - Add unit and integration tests for notification service
Sep 12, 2023
f7c34ee
Merge pull request #18 from ejp-rd-vp/feature/11-Add-unit-and-integra…
ammarbarakat Sep 12, 2023
4de77e3
#19 - Allow User Authentication in Swagger Documentation
Sep 13, 2023
91fde4b
Merge pull request #20 from ejp-rd-vp/feature/19-Allow-User-Authentic…
ammarbarakat Sep 13, 2023
573030f
#21 - Update Spring Security Config to Use Signature Algorithm ES256
Sep 13, 2023
89f9398
Merge pull request #22 from ejp-rd-vp/feature/21-Update-Spring-Securi…
ammarbarakat Sep 13, 2023
b5ad6af
#23 - Check unauthorized filters
Sep 18, 2023
5232731
Merge pull request #24 from ejp-rd-vp/feature/23-Check-unauthorized-f…
ammarbarakat Sep 18, 2023
87f9d4d
Create dev-ci-cd.yml
ammarbarakat Sep 20, 2023
08e6045
no issue - add Dockerfile
Sep 20, 2023
1f08f30
no issue - update static resources file
Sep 21, 2023
e73c824
no issue - update Dockerfile
Sep 21, 2023
8f61638
#25 - Send the Authorization Header to Resources for Proper Authoriza…
Sep 28, 2023
47dd1d9
Merge pull request #26 from ejp-rd-vp/feature/25-Send-the-Authorizati…
ammarbarakat Sep 28, 2023
544ef0f
#27 - Allow Defining the Base URL for Swagger UI Using Environment Va…
Sep 28, 2023
7ccca45
Merge pull request #28 from ejp-rd-vp/feature/27-Allow-Defining-the-B…
ammarbarakat Sep 28, 2023
0a73808
29-Adjust-resource-type
Nov 27, 2023
0c43355
#29-Adjust-resource-type
Nov 27, 2023
4a688e1
Merge remote-tracking branch 'origin/feature/29-adjust-resource-type'…
Nov 27, 2023
daa750a
#31 - update resources
Nov 27, 2023
5d62239
Merge branch 'feature/29-adjust-resource-type' into update-resources
Nov 27, 2023
0a96a03
Merge pull request #30 from ejp-rd-vp/feature/29-adjust-resource-type
vabishaa Nov 28, 2023
45c2b67
Merge branch 'update-resources' into develop
Dec 5, 2023
0a136c6
#33 - filters are ignored
Feb 4, 2024
9fdd2da
Merge pull request #34 from ejp-rd-vp/bugfix/33-filters-are-ignored
vabishaa Feb 4, 2024
df6beb7
#35-Search-results-when-searching-for-ORPHA:635-do-not-stop
LarieSB Feb 12, 2024
0226130
#35-Search-results-when-searching-for-ORPHA:635-do-not-stop
LarieSB Feb 12, 2024
85df705
#35-Search-results-when-searching-for-ORPHA:635-do-not-stop
LarieSB Feb 13, 2024
aefc4e5
Merge remote-tracking branch 'origin/develop' into #35-Search-results…
vabishaa Feb 14, 2024
f835be7
Merge pull request #36 from ejp-rd-vp/#35-Search-results-when-searchi…
vabishaa Feb 14, 2024
1eaa099
Update resources.txt
vabishaa Feb 14, 2024
b927b06
Update resources.txt
vabishaa Feb 14, 2024
5a501cd
Update resources.txt
inesohenriques Feb 24, 2024
3bd1fd7
Update resources.txt
inesohenriques Feb 25, 2024
b42c7f6
Update resources.txt
inesohenriques Feb 26, 2024
176da1a
Update resources.txt
inesohenriques Feb 26, 2024
d0b197e
Update resources.txt
inesohenriques Feb 27, 2024
b991abc
Update resources.txt
HaddadTala Feb 29, 2024
659e54b
Update resources.txt
inesohenriques Feb 29, 2024
04b092a
Update resources.txt
inesohenriques Feb 29, 2024
b0e044c
feat: updates resource.txt with new BBMRI ERIC Directory parameters
svituz Mar 1, 2024
99b4c9a
Update resources.txt
Orphanet Mar 1, 2024
a76e19e
added the DPP FAIR data point and beacon
markwilkinson Mar 2, 2024
05ef517
Merge pull request #43 from ejp-rd-vp/Orphanet-patch-1_update_resources
vabishaa Mar 4, 2024
a7eb86b
Merge branch 'ines_working_resources' into develop
vabishaa Mar 4, 2024
e44f3b7
Merge remote-tracking branch 'origin/inesohenriques-patch-1' into dev…
vabishaa Mar 4, 2024
58f6cd4
Merge remote-tracking branch 'origin/feat/bbmri_updates_resources_txt…
vabishaa Mar 4, 2024
644301d
Merge remote-tracking branch 'origin/update-resources' into develop
vabishaa Mar 4, 2024
05bf238
#46 - remove email adresse from resource list
vabishaa Mar 4, 2024
8d400eb
#48 - Error connecting new BBMRI endpoint
vabishaa Mar 4, 2024
3db50c0
Merge branch 'develop' into develop
vabishaa Mar 5, 2024
2d51808
Merge pull request #44 from markwilkinson/develop
vabishaa Mar 5, 2024
feeb750
change email in resourcelist
vabishaa Mar 11, 2024
bf395c3
update resou
vabishaa Mar 11, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions .github/ISSUE_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
**Describe your problem.**

A clear and concise description of what the problem is.


**If it is a bug name steps to reproduce**

Steps to reproduce the behavior:
1. Go to '...'
2. Click on '....'
3. Scroll down to '....'
4. See error


**If it is a bug complete the following information:**

- Version: [e.g. 1.2.3]
- OS: [e.g. Windows, Linux, OS X]
- Browser: [e.g. chrome, firefox, safari]


**Describe the solution you'd like**

A clear and concise description of what you want to happen.


**Additional context**

Add any other context or screenshots about the feature request here.
5 changes: 5 additions & 0 deletions .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
**What's in the PR**
* ...

**How to test manually**
* ...
5 changes: 5 additions & 0 deletions .github/semantic.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# Always validate the PR title AND all the commits
titleAndCommits: true
# Allows use of Merge commits (eg on github: "Merge branch 'master' into feature/ride-unicorns")
# this is only relevant when using commitsOnly: true (or titleAndCommits: true)
allowMergeCommits: true
46 changes: 46 additions & 0 deletions .github/workflows/dev-ci-cd.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
name: DEV-CI-CD

on:
push:
branches: [ "develop" ]

jobs:

ci:

runs-on: ubuntu-latest
environment: DEV

steps:
- uses: actions/checkout@v3

- name: Set up JDK 17
uses: actions/setup-java@v2
with:
java-version: '17'
distribution: 'temurin'
cache: maven

- name: Build with Maven
run: mvn clean package -Dmaven.source.skip -Dmaven.test.skip=true

- name: Build the Docker image
run: docker build . --file docker/Dockerfile --tag ${{ secrets.DOCKER_IMAGE_TAG }} --no-cache

- name: Login to Registry
run: docker login ${{ secrets.REGISTRY_URL }} -u ${{ secrets.REGISTRY_USERNAME }} -p ${{ secrets.REGISTRY_PASSWORD }}

- name: Push the latest DEV image
run: docker push ${{ secrets.DOCKER_IMAGE_TAG }}

cd:
name: Redeploy - Webhook call
runs-on: ubuntu-latest
environment: DEV
needs: ci
steps:
- name: Redeploy
uses: joelwmale/webhook-action@master
with:
url: ${{ secrets.WEBHOOK_URL }}
headers: ${{ secrets.WEBHOOK_HEADERS }}
201 changes: 201 additions & 0 deletions LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,201 @@
Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don't include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.
Copyright [yyyy] [name of copyright owner]
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
60 changes: 60 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,60 @@
# VP-Portal Backend: Federated Discovery and Query Platform for Rare Disease Research

Welcome to the vp-dp-backend GitHub repository! This repository contains the codebase for the backend of the Virtual Platform, a revolutionary initiative that aims to provide a federated ecosystem for discovering, querying, and accessing a wide range of resources relevant to rare disease (RD) research.

## About VP-Portal Backend

The EJP VP-Portal Backend serves as the foundational engine powering the EJP VP-Portal ecosystem. It offers an array of sophisticated functionalities, including advanced disease search capabilities, comprehensive disease hierarchy retrieval, precision gene mapping, efficient search autocompletion, robust resource monitoring service, seamless resource notification service, and an array of other distinctive features. These capabilities collectively aim to ensure an unparalleled user experience within the VP-Portal environment.

## Table of Contents
- [Installation](#installation)
- [Dependencies](#dependencies)
- [License](#license)
- [Contact Information](#contact-information)

## Installation
To set up the VP-Portal Backend on your local environment, follow these steps:

Clone this repository:
```bash
git clone https://github.com/ejp-rd-vp/vp-dp-backend.git
```
Navigate to the project directory:
```bash
cd vp-dp-backend
```
Build the application using Maven:
```bash
mvn clean install
```
Run the application:
```bash
java -jar target/vp-dp-backend.jar
```
The backend server will start, and you can access it at http://localhost:8095.

## Dependencies

The VP-Portal Backend is built using the Spring Boot framework and utilizes the following key dependencies:


* Spring Boot: Apache License 2.0
* Project Lombok: MIT License
* PostgreSQL JDBC Driver: PostgreSQL License
* Jackson Core: Apache License 2.0
* JUnit Jupiter Engine: Eclipse Public License - v 1.0
* H2 Database: H2 License
* SpringDoc OpenAPI Starter WebMvc UI: Apache License 2.0
* JavaMail API: Common Development and Distribution License (CDDL) v1.1 + GNU General Public License (GPL) v2


## License

This project is licensed under the [Apache License 2.0](https://github.com/ejp-rd-vp/vp-dp-backend/blob/develop/LICENSE).


## Contact Information

Stay connected with the VP-Portal community to receive updates, announcements, and insights. Follow us on [Twitter](https://twitter.com/ejprarediseases?lang=de) | [Instagram](https://www.instagram.com/ejprarediseases/?hl=de) and participate in discussions.

If you encounter any issues, have questions, or need assistance, feel free to reach out to our community through GitHub issues or our communication channels. We're here to support you on your journey with VP-Portal Backend!
8 changes: 8 additions & 0 deletions docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
FROM openjdk:18-jdk-alpine
EXPOSE 8095
RUN apk add sudo
RUN addgroup -S ejp && adduser -S ejp -G ejp
USER ejp:ejp
ARG JAR_FILE=target/*.jar
COPY ${JAR_FILE} /opt/app.jar
ENTRYPOINT ["sh", "-c", "java ${JAVA_OPTS} -jar /opt/app.jar"]
12 changes: 7 additions & 5 deletions pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
<description>vp-dp-backend</description>
<properties>
<java.version>17</java.version>
<testcontainers.version>1.18.0</testcontainers.version>
</properties>
<dependencies>
<dependency>
Expand Down Expand Up @@ -87,11 +88,6 @@
<artifactId>junit</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>com.h2database</groupId>
<artifactId>h2</artifactId>
<scope>test</scope>
</dependency>
<dependency>
<groupId>org.springdoc</groupId>
<artifactId>springdoc-openapi-starter-webmvc-ui</artifactId>
Expand All @@ -102,6 +98,12 @@
<artifactId>javax.mail</artifactId>
<version>1.6.2</version>
</dependency>
<dependency>
<groupId>org.testcontainers</groupId>
<artifactId>postgresql</artifactId>
<version>${testcontainers.version}</version>
<scope>test</scope>
</dependency>
</dependencies>

<build>
Expand Down
Loading