Commit 6c96f171 authored by Ecenur Sezer's avatar Ecenur Sezer
Browse files

fix: changes on feedback in readme, grafana and rating service

parent 4bf09570
Loading
Loading
Loading
Loading
Loading
+18 −2
Original line number Diff line number Diff line
@@ -16,6 +16,22 @@ This web application serves as a catalogue of movies across several genres. User

- **Administrator Control**: Only administrators have the authority to create, update, or remove movies from the catalogue, ensuring that the database is well-maintained and up-to-date.

## Technologies Used

- Docker
- Spring Boot
- PostgreSQL
- MapStruct
- Grafana
- Prometheus

## Team Members

- Lukas Chudicek (team lead)
- Daniel Nemec
- Mario Straus
- Ecenur Sezer

## Modules

The information about each specific module can be found in the README.md file of each module.
@@ -58,6 +74,6 @@ docker-compose up -d

- note that you might need to clear the old images (if any present)

To observe the metrics of the system after the docker containers are up, please visit [Grafana UI](<localhost:3000>) with default credentials _admin:admin_.
To observe the metrics of the system after the docker containers are up, please visit [Grafana UI](https://localhost:3000) with default credentials _admin:admin_.

![Main dashboard](image.png)
A [screenshot](documentation/grafana-dashboard.png) of grafana board is also provided in documentation.
+4 −8
Original line number Diff line number Diff line
# client
# Client Project

This project is here just to get the user token
This project provides the token to access the endpoints.

## Running

u know
Execute the following command to run the project.

```shell
mvn clean install -DskipTests && mvn spring-boot:run
@@ -15,15 +15,11 @@ mvn clean install -DskipTests && mvn spring-boot:run
- go to <http://localhost:8080>
- login with `muni`
- -> `yes continue` button
- at this point there should be a bunch of uninteresting mess in the console
- click the `go to my calendar interface` button
- even though the backend is not running, the token is dumped into the console
- it is what it is
- even though the backend is not running, the token is available at the console.

## Using the token

- i recommend

```shell
export TOKEN=the_token
```
+9 −13
Original line number Diff line number Diff line
version: '3.8'

services:

  prometheus:
    image: prom/prometheus:v2.43.0
    volumes:
@@ -20,7 +17,7 @@ services:
      - movie-recommender-service

  grafana:
    image: grafana/grafana
    image: grafana/grafana:8.5.5
    volumes:
      - ./grafana/dashboards:/var/lib/grafana/dashboards
      - ./grafana/provisioning/dashboards.yml:/etc/grafana/provisioning/dashboards/dashboards.yml
@@ -77,8 +74,8 @@ services:

  user-service:
    build:
      context: ./user-microservice # Assumes Dockerfile is in the same directory as docker-compose.yml
      dockerfile: Dockerfile # Name of the Dockerfile
      context: ./user-microservice
      dockerfile: Dockerfile
    container_name: user-microservice
    ports:
      - "${USER_PORT}:${USER_PORT}"
@@ -94,8 +91,8 @@ services:

  movie-service:
    build:
      context: ./movie-microservice # Assumes Dockerfile is in the same directory as docker-compose.yml
      dockerfile: Dockerfile # Name of the Dockerfile
      context: ./movie-microservice
      dockerfile: Dockerfile
    container_name: movie-microservice
    ports:
      - "${MOVIE_PORT}:${MOVIE_PORT}"
@@ -111,8 +108,8 @@ services:

  rating-service:
    build:
      context: ./rating-microservice # Assumes Dockerfile is in the same directory as docker-compose.yml
      dockerfile: Dockerfile # Name of the Dockerfile
      context: ./rating-microservice
      dockerfile: Dockerfile
    container_name: rating-microservice
    ports:
      - "${RATING_PORT}:${RATING_PORT}"
@@ -128,8 +125,8 @@ services:

  movie-recommender-service:
    build:
      context: ./movie-recommender-microservice # Assumes Dockerfile is in the same directory as docker-compose.yml
      dockerfile: Dockerfile # Name of the Dockerfile
      context: ./movie-recommender-microservice
      dockerfile: Dockerfile
    container_name: movie-recommender-microservice
    ports:
      - "${MOVIE_RECOMMENDER_PORT}:${MOVIE_RECOMMENDER_PORT}"
@@ -138,7 +135,6 @@ services:
      - rating-service

volumes:
  #  movie-recommender-postgres-data: # no db -> no volume
  movie-microservice-postgres-data:
  rating-microservice-postgres-data:
  user-microservice-postgres-data:
+461 KiB
Loading image diff...
+1 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ To get the microservice running you need to run docker compose in the parent dir
docker compose up --build 
```

The service will be accessible at localhost:8001/api/v1/movies
The movie microservice endpoints work in [localhost:8001/api/v1/movies](http://localhost:8001/api/v1/movies).

## Movie API endpoints

Loading