Merge pull request #30 from dacharyc/move-feature-complete-apps

Move Java Spring and Python FastAPI apps to final dir structure

Author: dacharyc

.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,12 +55,12 @@ 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
         if: always()
         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

.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

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

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

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

server/java-spring/.env.example renamed to 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:[email protected]/?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