diff --git a/.github/workflows/run-java-spring-boot-tests.yml b/.github/workflows/run-java-spring-boot-tests.yml index 8108f69..6c4ffa9 100644 --- a/.github/workflows/run-java-spring-boot-tests.yml +++ b/.github/workflows/run-java-spring-boot-tests.yml @@ -4,9 +4,13 @@ on: pull_request_target: branches: - development + paths: + - 'mflix/server/java-spring/**' push: branches: - development + paths: + - 'mflix/server/java-spring/**' jobs: test: @@ -17,7 +21,7 @@ jobs: defaults: run: - working-directory: server/java-spring + working-directory: mflix/server/java-spring env: MONGODB_URI: ${{ secrets.MFLIX_URI }} @@ -39,13 +43,6 @@ jobs: - name: Make mvnw executable run: chmod +x mvnw - - name: Debug environment variables - run: | - echo "Checking environment variables..." - echo "MONGODB_URI is set: $(if [ -n "$MONGODB_URI" ]; then echo 'YES'; else echo 'NO'; fi)" - echo "ENABLE_SEARCH_TESTS is set: $(if [ -n "$ENABLE_SEARCH_TESTS" ]; then echo 'YES'; else echo 'NO'; fi)" - echo "MONGODB_URI length: ${#MONGODB_URI}" - - name: Run unit tests run: ./mvnw test @@ -58,7 +55,7 @@ jobs: if: always() with: name: test-results - path: server/java-spring/target/surefire-reports/ + path: mflix/server/java-spring/target/surefire-reports/ retention-days: 30 - name: Generate Test Summary @@ -66,4 +63,4 @@ jobs: working-directory: . run: | chmod +x .github/scripts/generate-test-summary-surefire.sh - .github/scripts/generate-test-summary-surefire.sh server/java-spring/target/surefire-reports + .github/scripts/generate-test-summary-surefire.sh mflix/server/java-spring/target/surefire-reports diff --git a/.github/workflows/run-python-tests.yml b/.github/workflows/run-python-tests.yml index 117671a..11b43cc 100644 --- a/.github/workflows/run-python-tests.yml +++ b/.github/workflows/run-python-tests.yml @@ -4,9 +4,13 @@ on: pull_request_target: branches: - development + paths: + - 'mflix/server/python-fastapi/**' push: branches: - development + paths: + - 'mflix/server/python-fastapi/**' jobs: test: @@ -17,7 +21,7 @@ jobs: defaults: run: - working-directory: server/python + working-directory: mflix/server/python-fastapi steps: - name: Checkout code @@ -54,9 +58,9 @@ jobs: with: name: test-results path: | - server/python/test-results-unit.xml - server/python/test-results-integration.xml - server/python/htmlcov/ + mflix/server/python-fastapi/test-results-unit.xml + mflix/server/python-fastapi/test-results-integration.xml + mflix/server/python-fastapi/htmlcov/ retention-days: 30 - name: Generate Test Summary @@ -65,5 +69,5 @@ jobs: run: | chmod +x .github/scripts/generate-test-summary-pytest.sh .github/scripts/generate-test-summary-pytest.sh \ - server/python/test-results-unit.xml \ - server/python/test-results-integration.xml + mflix/server/python-fastapi/test-results-unit.xml \ + mflix/server/python-fastapi/test-results-integration.xml diff --git a/mflix/.gitignore-java b/mflix/.gitignore-java new file mode 100644 index 0000000..9e08a98 --- /dev/null +++ b/mflix/.gitignore-java @@ -0,0 +1,113 @@ +#------- +# Common +#------- + +# Environment variables +.env +!.env.example +*.pem + +#MacOS files +.DS_Store + +#--------------------------- +# Java / Spring Boot backend +#--------------------------- + +#Cache +.cache/ + +# Compiled Files +*.class +*.ctxt +.mtj.tmp/ + +# Package Files +*.jar +*.war +*.nar +*.ear + +# Crash Logs +hs_err_pid* +replay_pid* + +# Maven +target/ +pom.xml.tag +pom.xml.releaseBackup +pom.xml.versionsBackup +pom.xml.next +release.properties +dependency-reduced-pom.xml +buildNumber.properties +.mvn/timing.properties +.mvn/wrapper/maven-wrapper.jar + +# IntelliJ IDEA +*.iws +*.iml +*.ipr +out/ +!**/src/main/**/out/ +!**/src/test/**/out/ + +# Eclipse +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache +bin/ +!**/src/main/**/bin/ +!**/src/test/**/bin/ + +# NetBeans +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ + +# Spring Boot +spring-boot-devtools.properties + +#------------------------ +# Next.js Client frontend +#------------------------ + +# dependencies +/node_modules +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions +package-lock.json + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# debug +npm-debug.log* +yarn-debug.log* +yarn-error.log* +.pnpm-debug.log* + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/mflix/.gitignore-js b/mflix/.gitignore-js new file mode 100644 index 0000000..aa54d26 --- /dev/null +++ b/mflix/.gitignore-js @@ -0,0 +1,62 @@ +#------- +# Common +#------- + +# Environment variables +.env +!.env.example +*.pem + +#MacOS files +.DS_Store + +# Dependencies +node_modules/ +package-lock.json +/.pnp +.pnp.* +.yarn/* +!.yarn/patches +!.yarn/plugins +!.yarn/releases +!.yarn/versions + +# TypeScript +*.tsbuildinfo + +# Test coverage +coverage/ + +# Logs +logs +*.log + +#------------------- +# Express.js Backend +#------------------- + +# Build output +dist/ + +# Test results +test-results.json + +# Optional npm cache directory +.npm + +#------------------------ +# Next.js Client frontend +#------------------------ + +# next.js +/.next/ +/out/ + +# production +/build + +# vercel +.vercel + +# typescript +next-env.d.ts diff --git a/mflix/.gitignore-python b/mflix/.gitignore-python new file mode 100644 index 0000000..41f9a7e --- /dev/null +++ b/mflix/.gitignore-python @@ -0,0 +1,52 @@ +#------- +# Common +#------- + +# Environment variables +.env +!.env.example +*.pem + +#MacOS files +.DS_Store + +#------------------------- +# Python / FastAPI backend +#------------------------- + +# Byte-compiled / optimized files +__pycache__/ +*.py[cod] +*$py.class + +# Virtual environment +.venv/ + +#------------------------ +# Next.js Client frontend +#------------------------ + +# dependencies +/node_modules +package-lock.json + +# testing +/coverage + +# next.js +/.next/ +/out/ + +# production +/build + +# Logs +logs +*.log + +# vercel +.vercel + +# typescript +*.tsbuildinfo +next-env.d.ts diff --git a/server/java-spring/.env.example b/mflix/server/java-spring/.env.example similarity index 76% rename from server/java-spring/.env.example rename to mflix/server/java-spring/.env.example index df7ce44..9efc711 100644 --- a/server/java-spring/.env.example +++ b/mflix/server/java-spring/.env.example @@ -2,6 +2,10 @@ # Replace with your MongoDB Atlas connection string or local MongoDB URI MONGODB_URI=mongodb+srv://username:password@cluster.mongodb.net/?retryWrites=true&w=majority +# Voyage AI Configuration +# API key for Voyage AI embedding model (required for Vector Search) +VOYAGE_API_KEY=your_voyage_api_key + # Server Configuration # Port on which the Spring Boot application will run PORT=3001 diff --git a/server/java-spring/.gitignore b/mflix/server/java-spring/.gitignore similarity index 100% rename from server/java-spring/.gitignore rename to mflix/server/java-spring/.gitignore diff --git a/server/java-spring/.mvn/wrapper/maven-wrapper.properties b/mflix/server/java-spring/.mvn/wrapper/maven-wrapper.properties similarity index 100% rename from server/java-spring/.mvn/wrapper/maven-wrapper.properties rename to mflix/server/java-spring/.mvn/wrapper/maven-wrapper.properties diff --git a/server/java-spring/mvnw b/mflix/server/java-spring/mvnw similarity index 100% rename from server/java-spring/mvnw rename to mflix/server/java-spring/mvnw diff --git a/server/java-spring/mvnw.cmd b/mflix/server/java-spring/mvnw.cmd similarity index 100% rename from server/java-spring/mvnw.cmd rename to mflix/server/java-spring/mvnw.cmd diff --git a/server/java-spring/pom.xml b/mflix/server/java-spring/pom.xml similarity index 100% rename from server/java-spring/pom.xml rename to mflix/server/java-spring/pom.xml diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/SampleMflixApplication.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/SampleMflixApplication.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/SampleMflixApplication.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/SampleMflixApplication.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/CorsConfig.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/CorsConfig.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/CorsConfig.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/CorsConfig.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/DatabaseVerification.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/DatabaseVerification.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/DatabaseVerification.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/DatabaseVerification.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/MongoConfig.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/MongoConfig.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/MongoConfig.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/MongoConfig.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectIdSerializer.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectIdSerializer.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectIdSerializer.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectIdSerializer.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectMapperConfig.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectMapperConfig.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectMapperConfig.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/ObjectMapperConfig.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/OpenApiConfig.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/OpenApiConfig.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/OpenApiConfig.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/OpenApiConfig.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/config/WebMvcConfig.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/WebMvcConfig.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/config/WebMvcConfig.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/config/WebMvcConfig.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/controller/MovieControllerImpl.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/controller/MovieControllerImpl.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/controller/MovieControllerImpl.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/controller/MovieControllerImpl.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/DatabaseOperationException.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/DatabaseOperationException.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/exception/DatabaseOperationException.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/DatabaseOperationException.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/GlobalExceptionHandler.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/GlobalExceptionHandler.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/exception/GlobalExceptionHandler.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/GlobalExceptionHandler.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ResourceNotFoundException.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ResourceNotFoundException.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ResourceNotFoundException.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ResourceNotFoundException.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ValidationException.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ValidationException.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ValidationException.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/exception/ValidationException.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Comment.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Comment.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/Comment.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Comment.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Movie.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Movie.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/Movie.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Movie.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Theater.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Theater.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/Theater.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/Theater.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchInsertResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchInsertResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchInsertResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchInsertResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchUpdateResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchUpdateResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchUpdateResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/BatchUpdateResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/CreateMovieRequest.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/CreateMovieRequest.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/CreateMovieRequest.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/CreateMovieRequest.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DeleteResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DeleteResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DeleteResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DeleteResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DirectorStatisticsResult.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DirectorStatisticsResult.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DirectorStatisticsResult.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/DirectorStatisticsResult.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchQuery.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchQuery.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchQuery.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchQuery.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchRequest.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchRequest.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchRequest.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieSearchRequest.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieWithCommentsResult.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieWithCommentsResult.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieWithCommentsResult.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MovieWithCommentsResult.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MoviesByYearResult.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MoviesByYearResult.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MoviesByYearResult.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/MoviesByYearResult.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/SearchMoviesResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/SearchMoviesResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/SearchMoviesResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/SearchMoviesResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/UpdateMovieRequest.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/UpdateMovieRequest.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/UpdateMovieRequest.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/UpdateMovieRequest.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/VectorSearchResult.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/VectorSearchResult.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/VectorSearchResult.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/dto/VectorSearchResult.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ApiResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ApiResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ApiResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ApiResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ErrorResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ErrorResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ErrorResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/ErrorResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/SuccessResponse.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/SuccessResponse.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/SuccessResponse.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/model/response/SuccessResponse.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/repository/MovieRepository.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/repository/MovieRepository.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/repository/MovieRepository.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/repository/MovieRepository.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieService.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieService.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieService.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieService.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieServiceImpl.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieServiceImpl.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieServiceImpl.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/service/MovieServiceImpl.java diff --git a/server/java-spring/src/main/java/com/mongodb/samplemflix/util/ValidationUtils.java b/mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/util/ValidationUtils.java similarity index 100% rename from server/java-spring/src/main/java/com/mongodb/samplemflix/util/ValidationUtils.java rename to mflix/server/java-spring/src/main/java/com/mongodb/samplemflix/util/ValidationUtils.java diff --git a/server/java-spring/src/main/resources/application.properties b/mflix/server/java-spring/src/main/resources/application.properties similarity index 100% rename from server/java-spring/src/main/resources/application.properties rename to mflix/server/java-spring/src/main/resources/application.properties diff --git a/server/java-spring/src/test/java/com/mongodb/samplemflix/controller/MovieControllerTest.java b/mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/controller/MovieControllerTest.java similarity index 100% rename from server/java-spring/src/test/java/com/mongodb/samplemflix/controller/MovieControllerTest.java rename to mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/controller/MovieControllerTest.java diff --git a/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MongoDBSearchIntegrationTest.java b/mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MongoDBSearchIntegrationTest.java similarity index 100% rename from server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MongoDBSearchIntegrationTest.java rename to mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MongoDBSearchIntegrationTest.java diff --git a/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MovieIntegrationTest.java b/mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MovieIntegrationTest.java similarity index 100% rename from server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MovieIntegrationTest.java rename to mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/MovieIntegrationTest.java diff --git a/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/README.md b/mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/README.md similarity index 100% rename from server/java-spring/src/test/java/com/mongodb/samplemflix/integration/README.md rename to mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/integration/README.md diff --git a/server/java-spring/src/test/java/com/mongodb/samplemflix/service/MovieServiceTest.java b/mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/service/MovieServiceTest.java similarity index 100% rename from server/java-spring/src/test/java/com/mongodb/samplemflix/service/MovieServiceTest.java rename to mflix/server/java-spring/src/test/java/com/mongodb/samplemflix/service/MovieServiceTest.java diff --git a/server/java-spring/src/test/resources/application-test.properties b/mflix/server/java-spring/src/test/resources/application-test.properties similarity index 100% rename from server/java-spring/src/test/resources/application-test.properties rename to mflix/server/java-spring/src/test/resources/application-test.properties diff --git a/server/python/.env.example b/mflix/server/python-fastapi/.env.example similarity index 62% rename from server/python/.env.example rename to mflix/server/python-fastapi/.env.example index 363a620..7303405 100644 --- a/server/python/.env.example +++ b/mflix/server/python-fastapi/.env.example @@ -2,6 +2,10 @@ MONGO_URI="mongodb://localhost:27017" MONGO_DB="sample_mflix" +# Voyage AI Configuration +# API key for Voyage AI embedding model (required for Vector Search) +VOYAGE_API_KEY=your_voyage_api_key + # CORS Configuration # Comma-separated list of allowed origins for CORS CORS_ORIGINS="http://localhost:3000,http://localhost:3001" \ No newline at end of file diff --git a/server/python/.gitignore b/mflix/server/python-fastapi/.gitignore similarity index 100% rename from server/python/.gitignore rename to mflix/server/python-fastapi/.gitignore diff --git a/server/python/README.md b/mflix/server/python-fastapi/README_OLD_REMOVE_ME.md similarity index 100% rename from server/python/README.md rename to mflix/server/python-fastapi/README_OLD_REMOVE_ME.md diff --git a/server/python/main.py b/mflix/server/python-fastapi/main.py similarity index 100% rename from server/python/main.py rename to mflix/server/python-fastapi/main.py diff --git a/server/python/pytest.ini b/mflix/server/python-fastapi/pytest.ini similarity index 100% rename from server/python/pytest.ini rename to mflix/server/python-fastapi/pytest.ini diff --git a/server/python/requirements.in b/mflix/server/python-fastapi/requirements.in similarity index 100% rename from server/python/requirements.in rename to mflix/server/python-fastapi/requirements.in diff --git a/server/python/requirements.txt b/mflix/server/python-fastapi/requirements.txt similarity index 100% rename from server/python/requirements.txt rename to mflix/server/python-fastapi/requirements.txt diff --git a/server/python/src/database/mongo_client.py b/mflix/server/python-fastapi/src/database/mongo_client.py similarity index 100% rename from server/python/src/database/mongo_client.py rename to mflix/server/python-fastapi/src/database/mongo_client.py diff --git a/server/python/src/models/models.py b/mflix/server/python-fastapi/src/models/models.py similarity index 100% rename from server/python/src/models/models.py rename to mflix/server/python-fastapi/src/models/models.py diff --git a/server/python/src/routers/movies.py b/mflix/server/python-fastapi/src/routers/movies.py similarity index 100% rename from server/python/src/routers/movies.py rename to mflix/server/python-fastapi/src/routers/movies.py diff --git a/server/python/src/utils/errorHandler.py b/mflix/server/python-fastapi/src/utils/errorHandler.py similarity index 100% rename from server/python/src/utils/errorHandler.py rename to mflix/server/python-fastapi/src/utils/errorHandler.py diff --git a/server/python/tests/README.md b/mflix/server/python-fastapi/tests/README.md similarity index 100% rename from server/python/tests/README.md rename to mflix/server/python-fastapi/tests/README.md diff --git a/server/python/tests/__init__.py b/mflix/server/python-fastapi/tests/__init__.py similarity index 100% rename from server/python/tests/__init__.py rename to mflix/server/python-fastapi/tests/__init__.py diff --git a/server/python/tests/conftest.py b/mflix/server/python-fastapi/tests/conftest.py similarity index 100% rename from server/python/tests/conftest.py rename to mflix/server/python-fastapi/tests/conftest.py diff --git a/server/python/tests/integration/__init__.py b/mflix/server/python-fastapi/tests/integration/__init__.py similarity index 100% rename from server/python/tests/integration/__init__.py rename to mflix/server/python-fastapi/tests/integration/__init__.py diff --git a/server/python/tests/integration/conftest.py b/mflix/server/python-fastapi/tests/integration/conftest.py similarity index 100% rename from server/python/tests/integration/conftest.py rename to mflix/server/python-fastapi/tests/integration/conftest.py diff --git a/server/python/tests/integration/test_movie_routes_integration.py b/mflix/server/python-fastapi/tests/integration/test_movie_routes_integration.py similarity index 100% rename from server/python/tests/integration/test_movie_routes_integration.py rename to mflix/server/python-fastapi/tests/integration/test_movie_routes_integration.py diff --git a/server/python/tests/test_movie_routes.py b/mflix/server/python-fastapi/tests/test_movie_routes.py similarity index 100% rename from server/python/tests/test_movie_routes.py rename to mflix/server/python-fastapi/tests/test_movie_routes.py diff --git a/server/python/tests/test_movie_schemas.py b/mflix/server/python-fastapi/tests/test_movie_schemas.py similarity index 100% rename from server/python/tests/test_movie_schemas.py rename to mflix/server/python-fastapi/tests/test_movie_schemas.py