Merge branch 'development' into docsp-54418-agg-fe

Author: jordan-smith721

mflix/README-JAVA-SPRING.md

@@ -0,0 +1,26 @@
+# Java Spring Boot MongoDB Sample MFlix Application
+
+[TODO: Add intro]
+
+```
+├── README.md
+├── client/     # Next.js frontend
+└── server/     # Java Spring backend
+```
+
+## Getting Started
+
+[TODO: Add getting started instructions explaining how to set connection string, start server, start client, etc.]
+
+## Issues
+
+If you have problems running the sample app, please check the following:
+
+- [ ] Verify that you have set your MongoDB connection string in the `.env` file.
+- [ ] Verify that you have started the Java Spring server.
+- [ ] Verify that you have started the Next.js client.
+- [ ] Verify that you have no firewalls blocking access to the server or client ports.
+
+If you have verified the above and still have issues, please
+[open an issue](https://github.com/mongodb/docs-sample-apps/issues/new/choose)
+on the source repository `mongodb/docs-sample-apps`.

mflix/README-JAVASCRIPT-EXPRESS.md

@@ -0,0 +1,26 @@
+# JavaScript Express.js MongoDB Sample MFlix Application
+
+[TODO: Add intro]
+
+```
+├── README.md
+├── client/     # Next.js frontend
+└── server/     # Express.js backend
+```
+
+## Getting Started
+
+[TODO: Add getting started instructions explaining how to set connection string, start server, start client, etc.]
+
+## Issues
+
+If you have problems running the sample app, please check the following:
+
+- [ ] Verify that you have set your MongoDB connection string in the `.env` file.
+- [ ] Verify that you have started the Express server.
+- [ ] Verify that you have started the Next.js client.
+- [ ] Verify that you have no firewalls blocking access to the server or client ports.
+
+If you have verified the above and still have issues, please
+[open an issue](https://github.com/mongodb/docs-sample-apps/issues/new/choose)
+on the source repository `mongodb/docs-sample-apps`.

mflix/README-PYTHON-FASTAPI.md

@@ -0,0 +1,26 @@
+# Python FastAPI MongoDB Sample MFlix Application
+
+[TODO: Add intro]
+
+```
+├── README.md
+├── client/     # Next.js frontend
+└── server/     # Python FastAPI backend
+```
+
+## Getting Started
+
+[TODO: Add getting started instructions explaining how to set connection string, start server, start client, etc.]
+
+## Issues
+
+If you have problems running the sample app, please check the following:
+
+- [ ] Verify that you have set your MongoDB connection string in the `.env` file.
+- [ ] Verify that you have started the Python FastAPI server.
+- [ ] Verify that you have started the Next.js client.
+- [ ] Verify that you have no firewalls blocking access to the server or client ports.
+
+If you have verified the above and still have issues, please
+[open an issue](https://github.com/mongodb/docs-sample-apps/issues/new/choose)
+on the source repository `mongodb/docs-sample-apps`.

server/java-spring/README.md

@@ -8,11 +8,11 @@ This application provides a REST API for managing movie data from MongoDB's samp
 
 - Spring Data MongoDB for simplified data access
 - CRUD operations (Create, Read, Update, Delete)
-- Text search functionality
+- MongoDB Atlas Search with multi-field search and compound operators
 - Filtering, sorting, and pagination
 - Comprehensive error handling
 - API documentation with Swagger/OpenAPI
-- MongoTemplate for complex queries
+- MongoTemplate for complex queries and aggregation pipelines
 
 ## Prerequisites
 
@@ -104,6 +104,7 @@ Once the application is running, you can access:
 
 ### Movies (✅ Implemented)
 
+#### CRUD Operations
 - `GET /api/movies` - Get all movies (with filtering, sorting, pagination)
 - `GET /api/movies/{id}` - Get a single movie by ID
 - `POST /api/movies` - Create a new movie
@@ -114,6 +115,48 @@ Once the application is running, you can access:
 - `DELETE /api/movies` - Delete multiple movies
 - `DELETE /api/movies/{id}/find-and-delete` - Find and delete a movie
 
+#### Aggregations
+- `GET /api/movies/aggregations/comments` - Get movies with most comments
+- `GET /api/movies/aggregations/years` - Aggregate movies by year with statistics
+- `GET /api/movies/aggregations/directors` - Aggregate directors with most movies
+
+#### Atlas Search
+- `GET /api/movies/search` - Search movies using MongoDB Atlas Search
+
+  **Query Parameters:**
+  - `plot` (optional) - Search in plot field using phrase matching
+  - `fullplot` (optional) - Search in fullplot field using phrase matching
+  - `directors` (optional) - Search in directors field with fuzzy matching
+  - `writers` (optional) - Search in writers field with fuzzy matching
+  - `cast` (optional) - Search in cast field with fuzzy matching
+  - `searchOperator` (optional) - Compound operator: `must` (default), `should`, `mustNot`, `filter`
+  - `limit` (optional) - Maximum results to return (default: 20, max: 100)
+  - `skip` (optional) - Number of results to skip for pagination (default: 0)
+
+  **Examples:**
+  ```bash
+  # Search by plot
+  GET /api/movies/search?plot=space+adventure
+
+  # Search by multiple fields with AND logic
+  GET /api/movies/search?directors=Coppola&cast=Pacino&searchOperator=must
+
+  # Search by multiple fields with OR logic
+  GET /api/movies/search?plot=crime&directors=Scorsese&searchOperator=should
+
+  # Search with pagination
+  GET /api/movies/search?cast=Tom+Hanks&limit=10&skip=20
+  ```
+
+  **Note:** At least one search field must be provided. The `searchOperator` determines how multiple search criteria are combined:
+  - `must` - All criteria must match (AND logic)
+  - `should` - At least one criterion should match (OR logic)
+  - `mustNot` - Criteria must not match (NOT logic)
+  - `filter` - Criteria must match but don't affect scoring
+
+#### Vector Search
+- `GET /api/movies/find-similar-movies` - Find similar movies using vector search on plot embeddings
+
 ## Development
 
 ### Running Tests
@@ -139,11 +182,19 @@ java -jar target/sample-mflix-spring-1.0.0.jar
 
 - **Movies CRUD API** - Full create, read, update, delete operations
 - **Spring Data MongoDB** - Repository pattern with MongoTemplate for complex queries
-- **Text Search** - Full-text search on movie titles, plots, and genres
+- **MongoDB Atlas Search** - Multi-field search with compound operators (must, should, mustNot, filter)
+  - Phrase matching on plot and fullplot fields
+  - Fuzzy text matching on directors, writers, and cast fields
+  - Support for complex search queries with multiple criteria
+- **MongoDB Aggregations** - Statistical aggregations by year, directors, and comments
+- **Vector Search** - Find similar movies using plot embeddings (requires Atlas Vector Search)
 - **Filtering & Pagination** - Query parameters for filtering, sorting, and pagination
 - **Custom Exception Handling** - Global exception handler with proper HTTP status codes
 - **Type-Safe DTOs** - Specific response types instead of generic Maps
-- **Unit Tests** - 35 tests covering service and controller layers
+- **Comprehensive Testing** - 60 tests covering service, controller, and integration layers
+  - 29 controller unit tests
+  - 27 service unit tests
+  - 4 Atlas Search integration tests (requires Atlas cluster)
 - **OpenAPI Documentation** - Swagger UI available at `/swagger-ui.html`
 - **Database Verification** - Startup checks for database connectivity and indexes
 
@@ -165,8 +216,15 @@ This application is designed as an educational sample to demonstrate:
 2. Best practices for Spring Boot REST API development
 3. Proper separation of concerns (Controller → Service → Repository)
 4. MongoDB CRUD operations and query patterns
-5. Error handling and validation in Spring Boot
-6. Using MongoTemplate for complex queries alongside Spring Data repositories
+5. **MongoDB Atlas Search** - Multi-field text search with compound operators
+   - Phrase matching for exact phrase searches
+   - Fuzzy text matching for typo-tolerant searches
+   - Compound operators (must, should, mustNot, filter) for complex queries
+6. **MongoDB Aggregation Pipelines** - Statistical aggregations and data transformations
+7. **Vector Search** - Semantic similarity search using embeddings
+8. Error handling and validation in Spring Boot
+9. Using MongoTemplate for complex queries alongside Spring Data repositories
+10. Comprehensive testing strategies (unit tests, integration tests)
 
 ## Troubleshooting
 

server/java-spring/pom.xml

@@ -66,6 +66,7 @@
             <artifactId>commons-lang3</artifactId>
             <version>${commons.lang3.version}</version>
         </dependency>
+
         <!-- SpringDoc OpenAPI (Swagger UI) -->
         <dependency>
             <groupId>org.springdoc</groupId>
@@ -85,6 +86,12 @@
             <artifactId>spring-boot-starter-test</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <!-- Jackson Databind for JSON serialization/deserialization -->
+        <dependency>
+            <groupId>com.fasterxml.jackson.core</groupId>
+            <artifactId>jackson-databind</artifactId>
+        </dependency>
     </dependencies>
 
     <build>
@@ -103,6 +110,17 @@
                 </configuration>
             </plugin>
 
+            <!-- Maven Compiler Plugin - Suppress annotation processing warnings -->
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-compiler-plugin</artifactId>
+                <configuration>
+                    <compilerArgs>
+                        <arg>-Xlint:-options</arg>
+                    </compilerArgs>
+                </configuration>
+            </plugin>
+
             <!-- Maven Surefire Plugin - Configure Mockito agent for Java 21+ -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
@@ -114,6 +132,7 @@
                     </argLine>
                 </configuration>
             </plugin>
+
             <!-- Sort and remove unused imports -->
             <plugin>
                 <groupId>net.revelc.code</groupId>

server/java-spring/src/main/java/com/mongodb/samplemflix/SampleMflixApplication.java

@@ -1,5 +1,6 @@
 package com.mongodb.samplemflix;
 
+import io.swagger.v3.oas.annotations.Hidden;
 import java.util.Map;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -26,7 +27,9 @@ public static void main(String[] args) {
 
     /**
      * Root endpoint providing basic information about the API.
+     * Hidden from Swagger UI documentation.
      */
+    @Hidden
     @GetMapping("/")
     public Map<String, Object> root() {
         return Map.of(

server/java-spring/src/main/java/com/mongodb/samplemflix/config/CorsConfig.java

@@ -1,6 +1,5 @@
 package com.mongodb.samplemflix.config;
 
-import java.util.Arrays;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -30,22 +29,29 @@ public class CorsConfig {
     @Bean
     public CorsFilter corsFilter() {
         CorsConfiguration config = new CorsConfiguration();
-        
-        // Allow credentials (cookies, authorization headers)
-        config.setAllowCredentials(true);
-        
-        // Set allowed origins from environment variable
-        config.setAllowedOrigins(Arrays.asList(allowedOrigins.split(",")));
-        
+
+        // Allow wildcard origins for Swagger UI
+        config.setAllowCredentials(false);
+
+        // Set allowed origins - include localhost for Swagger UI
+        // Parse the configured origins and add localhost variations for Swagger UI
+        String[] origins = allowedOrigins.split(",");
+        for (String origin : origins) {
+            config.addAllowedOrigin(origin.trim());
+        }
+        // Add localhost origins for Swagger UI (on any port)
+        config.addAllowedOriginPattern("http://localhost:*");
+        config.addAllowedOriginPattern("http://127.0.0.1:*");
+
         // Allow all headers
         config.addAllowedHeader("*");
-        
+
         // Allow all HTTP methods
         config.addAllowedMethod("*");
-        
+
         UrlBasedCorsConfigurationSource source = new UrlBasedCorsConfigurationSource();
         source.registerCorsConfiguration("/**", config);
-        
+
         return new CorsFilter(source);
     }
 }