diff --git a/.gitignore b/.gitignore index a6c485c..ebacbf4 100644 --- a/.gitignore +++ b/.gitignore @@ -2,3 +2,4 @@ server/.idea/ server/target/ .idea/ target/ +start_vpn.sh diff --git a/api_spec.md b/api_spec.md new file mode 100644 index 0000000..9e4c74a --- /dev/null +++ b/api_spec.md @@ -0,0 +1,54 @@ +# Meeting endpoint /meeting +## User Management is not supported yet + +DB Migration -> Konsti + +#Req-Body POST /meeting json + +{ + title: "string", + description: "string", # optional + links: "string", # optional + date_from: "string (dd-mm-yyyy:hh:mm)", + date_until: "string (dd-mm-yyyy:hh:mm)", + repeat: "enum (daily, weekly, monthly, never)", # std: never + place: "string" # optional +} + +Return: CREATED, BAD_REQUEST + +#Req-Body PUT /meeting URI Params : Optional + title: "string", + description: "string", # optional + links: "string", # optional + date_from: "string (dd-mm-yyyy:hh:mm)", + date_until: "string (dd-mm-yyyy:hh:mm)", + repeat: "enum (daily, weekly, monthly, never)", # std: never + place: "string" + +Return: OK, BAD_REQUEST, NOT_FOUND + +#GET /meeting URI Param: Optional +meeting-id +return: NOT_FOUND, JSON +JSON: + { + title: "string", + description: "string", # optional + links: "string", # optional + date_from: "string (dd-mm-yyyy:hh:mm)", + date_until: "string (dd-mm-yyyy:hh:mm)", + repeat: "enum (daily, weekly, monthly, never)", # std: never + place: "string" # optional + } + +Meeting-Entity: + Long id, + String title, + String description, + String links, + LocalDate date_from, + LocalDate date_until, + Repeatable(enum) repeat, + String place, + Optionial> users diff --git a/docker-compose.yml b/docker-compose.yml index 87c9642..49d3d46 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -1,5 +1,3 @@ -version: '3.8' - services: postgres-db: image: postgres:latest @@ -10,3 +8,9 @@ services: POSTGRES_DB: studbud ports: - "5432:5432" + + backend: + image: panderu/study-buddies-backend:latest + container_name: backend + ports: + - "8080:8080" diff --git a/server/application.properties b/server/application.properties new file mode 100644 index 0000000..9311e6a --- /dev/null +++ b/server/application.properties @@ -0,0 +1,8 @@ +spring.jpa.show-sql=true + +spring.datasource.url=jdbc:h2:mem:testdb;DB_CLOSE_DELAY=-1;DB_CLOSE_ON_EXIT=FALSE +spring.datasource.driver-class-name=org.h2.Driver +spring.datasource.username=sa +spring.datasource.password=password +spring.h2.console.enabled=true +spring.jpa.hibernate.ddl-auto=create-drop diff --git a/server/pom.xml b/server/pom.xml index aeca303..b1f7b37 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -55,12 +55,6 @@ spring-boot-starter-web - - - org.postgresql - postgresql - runtime - @@ -77,6 +71,14 @@ test + + + + com.h2database + h2 + runtime + + org.mapstruct @@ -90,6 +92,13 @@ springdoc-openapi-starter-webmvc-ui 2.5.0 + + + + org.bouncycastle + bcpkix-jdk18on + 1.78.1 +