Merge branch 'main' into 71-setup-monitoring-with-prometheus-and-grafana

Author: AlyAssem

.github/workflows/docker.yml

@@ -66,3 +66,9 @@ jobs:
           context: ./server/ratingservice
           push: true
           tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/rating-service:latest
+      - name: Build & push Gateway Service image
+        uses: docker/build-push-action@v4
+        with:
+          context: ./server/gateway
+          push: true
+          tags: ghcr.io/aet-devops25/team-the-merge-doctors/server/gateway-service:latest

.github/workflows/e2e-tests.yml

@@ -18,11 +18,7 @@ jobs:
 
       - uses: docker/setup-compose-action@v1
         name: Setup Docker
-
-      - name: Setup .env
-        run: |
-          cp docker/backend_config_files/.env.template docker/backend_config_files/.env
-
+        
       - name: Generate JWT Key
         run: |
           ./docker/backend_config_files/jwk-key-generator.sh

.gitignore

@@ -291,7 +291,6 @@ celerybeat.pid
 
 # Environments
 .secrets.env
-.env
 .venv
 env/
 venv/

README.md

@@ -2,11 +2,16 @@
 
 ## Endpoint Documentation
 
-The endpoints of the different services are documented either in the controllers of the services (e.g. [MentorProfileController](server/mentorshipservice/src/main/java/com/mentorpulse/mentorshipservice/controller/MentorProfileController.java), [GenAI](genai/controllers/api_controller.py)) or some are also documented in `.bru` files (see [mentor-pulse-bruno](/docs/mentor-pulse-bruno/)).
+The endpoints are documented using OpenAPI or Swagger schemas:
 
-## Setup
+- [Mentorship Service](/server/mentorshipservice/schema/mentorship-service-schema.json)
+- [User Service](/server/userservice/schema/user-service-schema.json)
+- [Rating Service](/server/ratingservice/schema/rating-service-schema.json)
 
-TODO: documentation to add for project setup (e.g. how to start with docker)
+- [GenAI Service](/genai/schema/genai-schema.json)
 
+Alternatively, you can also find the endpoints in the controllers of the services (e.g. [MentorProfileController](server/mentorshipservice/src/main/java/com/mentorpulse/mentorshipservice/controller/MentorProfileController.java), [GenAI](genai/controllers/api_controller.py)). Additionally, some are also documented in `.bru` files (see [mentor-pulse-bruno](/docs/mentor-pulse-bruno/)).
 
+## Setup
 
+TODO: documentation to add for project setup (e.g. how to start with docker)

client/orval.config.cjs

@@ -1,9 +1,5 @@
 const SHARED_CONFIG = {
   client: 'react-query',
-  baseUrl: {
-    // TODO: update base url for deployment
-    getBaseUrlFromSpecification: true,
-  },
   mock: false,
 };
 

client/playwright.config.ts

@@ -26,7 +26,7 @@ export default defineConfig({
   /* Shared settings for all the projects below. See https://playwright.dev/docs/api/class-testoptions. */
   use: {
     /* Base URL to use in actions like `await page.goto('/')`. */
-    baseURL: 'http://localhost:3000',
+    baseURL: 'http://localhost:80',
 
     /* Collect trace when retrying the failed test. See https://playwright.dev/docs/trace-viewer */
     trace: 'on-first-retry',

client/src/api/mentor.ts

@@ -217,7 +217,7 @@ export const scheduleSession = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<ScheduleSessionResponse>> => {
   return axios.default.put(
-    `http://localhost:8310/api/mentorship/scheduleSession`,
+    `/api/mentorship/scheduleSession`,
     scheduleSessionRequest,
     options,
   );
@@ -297,7 +297,7 @@ export const rejectApplication = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<RejectApplicationResponse>> => {
   return axios.default.put(
-    `http://localhost:8310/api/mentorship/rejectApplication/${id}`,
+    `/api/mentorship/rejectApplication/${id}`,
     undefined,
     options,
   );
@@ -377,7 +377,7 @@ export const acceptApplication = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<AcceptApplicationResponse>> => {
   return axios.default.put(
-    `http://localhost:8310/api/mentorship/acceptApplication/${id}`,
+    `/api/mentorship/acceptApplication/${id}`,
     undefined,
     options,
   );
@@ -457,7 +457,7 @@ export const listMentorProfiles = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<ListMentorProfileResponse>> => {
   return axios.default.post(
-    `http://localhost:8310/api/mentorship/listMentorProfiles`,
+    `/api/mentorship/listMentorProfiles`,
     listMentorProfileRequest,
     options,
   );
@@ -537,7 +537,7 @@ export const createSkill = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<CreateSkillResponse>> => {
   return axios.default.post(
-    `http://localhost:8310/api/mentorship/createSkill`,
+    `/api/mentorship/createSkill`,
     createSkillRequest,
     options,
   );
@@ -617,7 +617,7 @@ export const createMentorProfile = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<CreateMentorProfileResponse>> => {
   return axios.default.post(
-    `http://localhost:8310/api/mentorship/createMentorProfile`,
+    `/api/mentorship/createMentorProfile`,
     createMentorProfileRequest,
     options,
   );
@@ -697,7 +697,7 @@ export const createCategory = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<CreateCategoryResponse>> => {
   return axios.default.post(
-    `http://localhost:8310/api/mentorship/createCategory`,
+    `/api/mentorship/createCategory`,
     createCategoryRequest,
     options,
   );
@@ -777,7 +777,7 @@ export const createApplication = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<CreateApplicationResponse>> => {
   return axios.default.post(
-    `http://localhost:8310/api/mentorship/createApplication`,
+    `/api/mentorship/createApplication`,
     createApplicationRequest,
     options,
   );
@@ -857,7 +857,7 @@ export const updateMentorProfile = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<UpdateMentorProfileResponse>> => {
   return axios.default.patch(
-    `http://localhost:8310/api/mentorship/updateMentorProfile`,
+    `/api/mentorship/updateMentorProfile`,
     updateMentorProfileRequest,
     options,
   );
@@ -935,14 +935,11 @@ export const useUpdateMentorProfile = <
 export const listSkills = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<ListSkillResponse>> => {
-  return axios.default.get(
-    `http://localhost:8310/api/mentorship/listSkills`,
-    options,
-  );
+  return axios.default.get(`/api/mentorship/listSkills`, options);
 };
 
 export const getListSkillsQueryKey = () => {
-  return [`http://localhost:8310/api/mentorship/listSkills`] as const;
+  return [`/api/mentorship/listSkills`] as const;
 };
 
 export const getListSkillsQueryOptions = <
@@ -1062,14 +1059,11 @@ export function useListSkills<
 export const listCategories = (
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<ListCategoryResponse>> => {
-  return axios.default.get(
-    `http://localhost:8310/api/mentorship/listCategories`,
-    options,
-  );
+  return axios.default.get(`/api/mentorship/listCategories`, options);
 };
 
 export const getListCategoriesQueryKey = () => {
-  return [`http://localhost:8310/api/mentorship/listCategories`] as const;
+  return [`/api/mentorship/listCategories`] as const;
 };
 
 export const getListCategoriesQueryOptions = <
@@ -1190,20 +1184,17 @@ export const listApplications = (
   params?: ListApplicationsParams,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<ListApplicationResponse>> => {
-  return axios.default.get(
-    `http://localhost:8310/api/mentorship/listApplications`,
-    {
-      ...options,
-      params: { ...params, ...options?.params },
-    },
-  );
+  return axios.default.get(`/api/mentorship/listApplications`, {
+    ...options,
+    params: { ...params, ...options?.params },
+  });
 };
 
 export const getListApplicationsQueryKey = (
   params?: ListApplicationsParams,
 ) => {
   return [
-    `http://localhost:8310/api/mentorship/listApplications`,
+    `/api/mentorship/listApplications`,
     ...(params ? [params] : []),
   ] as const;
 };
@@ -1354,18 +1345,15 @@ export const getMentorProfile = (
   params: GetMentorProfileParams,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<GetMentorProfileResponse>> => {
-  return axios.default.get(
-    `http://localhost:8310/api/mentorship/getMentorProfile`,
-    {
-      ...options,
-      params: { ...params, ...options?.params },
-    },
-  );
+  return axios.default.get(`/api/mentorship/getMentorProfile`, {
+    ...options,
+    params: { ...params, ...options?.params },
+  });
 };
 
 export const getGetMentorProfileQueryKey = (params: GetMentorProfileParams) => {
   return [
-    `http://localhost:8310/api/mentorship/getMentorProfile`,
+    `/api/mentorship/getMentorProfile`,
     ...(params ? [params] : []),
   ] as const;
 };
@@ -1516,14 +1504,11 @@ export const getApplication = (
   id: string,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<GetApplicationResponse>> => {
-  return axios.default.get(
-    `http://localhost:8310/api/mentorship/application/${id}`,
-    options,
-  );
+  return axios.default.get(`/api/mentorship/application/${id}`, options);
 };
 
 export const getGetApplicationQueryKey = (id: string) => {
-  return [`http://localhost:8310/api/mentorship/application/${id}`] as const;
+  return [`/api/mentorship/application/${id}`] as const;
 };
 
 export const getGetApplicationQueryOptions = <
@@ -1656,10 +1641,10 @@ export const deleteMentorProfile = (
   deleteMentorProfileRequest: DeleteMentorProfileRequest,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<DeleteMentorProfileResponse>> => {
-  return axios.default.delete(
-    `http://localhost:8310/api/mentorship/deleteMentorProfile`,
-    { data: deleteMentorProfileRequest, ...options },
-  );
+  return axios.default.delete(`/api/mentorship/deleteMentorProfile`, {
+    data: deleteMentorProfileRequest,
+    ...options,
+  });
 };
 
 export const getDeleteMentorProfileMutationOptions = <

client/src/api/rating.ts

@@ -41,11 +41,7 @@ export const rateMentor = (
   rating: Rating,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<Rating>> => {
-  return axios.default.post(
-    `http://localhost:8410/api/rating/rateMentor`,
-    rating,
-    options,
-  );
+  return axios.default.post(`/api/rating/rateMentor`, rating, options);
 };
 
 export const getRateMentorMutationOptions = <
@@ -118,16 +114,11 @@ export const getRatingsByMentor = (
   mentorId: string,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<Rating[]>> => {
-  return axios.default.get(
-    `http://localhost:8410/api/rating/mentor/${mentorId}/ratings`,
-    options,
-  );
+  return axios.default.get(`/api/rating/mentor/${mentorId}/ratings`, options);
 };
 
 export const getGetRatingsByMentorQueryKey = (mentorId: string) => {
-  return [
-    `http://localhost:8410/api/rating/mentor/${mentorId}/ratings`,
-  ] as const;
+  return [`/api/rating/mentor/${mentorId}/ratings`] as const;
 };
 
 export const getGetRatingsByMentorQueryOptions = <
@@ -281,16 +272,11 @@ export const getAverageRating = (
   mentorId: string,
   options?: AxiosRequestConfig,
 ): Promise<AxiosResponse<MentorAverageRating>> => {
-  return axios.default.get(
-    `http://localhost:8410/api/rating/mentor/${mentorId}/average`,
-    options,
-  );
+  return axios.default.get(`/api/rating/mentor/${mentorId}/average`, options);
 };
 
 export const getGetAverageRatingQueryKey = (mentorId: string) => {
-  return [
-    `http://localhost:8410/api/rating/mentor/${mentorId}/average`,
-  ] as const;
+  return [`/api/rating/mentor/${mentorId}/average`] as const;
 };
 
 export const getGetAverageRatingQueryOptions = <