Merge pull request 'develope' (#1) from develope into main

Reviewed-on: f.mirabootalebi/HW-03-oop-and-api#1

src/main/java/Rational/Rational.java

@@ -41,9 +41,9 @@ public class Rational {
 
     //  COMPLETED - Instance method: this + other
     public Rational add(Rational other) {
-        int newNumerator = this.numerator * other.denominator + other.numerator * this.denominator;
-        int newDenominator = this.denominator * other.denominator;
-        return new Rational(newNumerator, newDenominator);
+        int newNum = this.numerator * other.denominator + other.numerator * this.denominator;
+        int newDenom = this.denominator * other.denominator;
+        return new Rational(newNum, newDenom);
     }
 
     //  COMPLETED - Static method: r1 + r2
@@ -54,42 +54,53 @@ public class Rational {
     // TODO: Instance method - this - other
     // Formula: a/b - c/d = (a*d - c*b) / (b*d)
     public Rational subtract(Rational other) {
-        // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        int newNum = this.numerator * other.numerator - other.numerator * this.denominator;
+        int newDenom = other.numerator * this.denominator;
+        return new Rational(newNum, newDenom);
     }
 
     // TODO: Static method - r1 - r2
     public static Rational subtract(Rational r1, Rational r2) {
-        // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        int newNum = r1.numerator * r2.denominator - r2.numerator * r1.denominator;
+        int newDenom = r1.denominator * r2.denominator;
+        return new Rational(newNum, newDenom);
     }
 
     // TODO: Instance method - this * other
     // Formula: (a/b) * (c/d) = (a*c) / (b*d)
     public Rational multiply(Rational other) {
-        // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        int newNum = this.numerator * other.numerator;
+        int newDenom = this.denominator * other.denominator;
+        return new Rational(newNum, newDenom);
     }
 
     // TODO: Static method - r1 * r2
     public static Rational multiply(Rational r1, Rational r2) {
-        // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        int newNum = r1.numerator * r2.numerator;
+        int newDenom = r1.denominator * r2.denominator;
+        return new Rational(newNum, newDenom);
     }
 
     // TODO: Instance method - this / other
     // Formula: (a/b) ÷ (c/d) = (a*d) / (b*c)
     public Rational divide(Rational other) {
-        // YOUR CODE HERE
-        // HINT: Division is multiplication by reciprocal
-        // Don't forget to check if other.numerator is zero!
-        return null; // Remove this line when implemented
+        if (other.numerator == 0){
+            throw new ArithmeticException("Cannot divide by zero");
+        }
+        int newNum = this.numerator * other.denominator;
+        int newDenom = this.denominator * other.numerator;
+        return new Rational(newNum, newDenom);
     }
 
     // TODO: Static method - r1 / r2
     public static Rational divide(Rational r1, Rational r2) {
-        // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        if (r2.numerator == 0){
+            throw new ArithmeticException("Cannot divide by zero");
+        }
+        int newNum = r1.numerator * r2.denominator;
+        int newDenom = r1.denominator * r2.numerator;
+
+        return new Rational(newNum, newDenom);
     }
 
     //  PROVIDED - String representation

src/main/java/movie/apis/Main.java

@@ -22,14 +22,18 @@ public class Main {
 
                 case 2:
                     // TODO: Get genre ID and page from user, then call movieService.displayMoviesByGenre()
-
+                    System.out.print("Enter genre ID: ");
+                    Long genreId = scanner.nextLong();
+                    System.out.print("Enter page number: ");
+                    Long page = scanner.nextLong();
+                    movieService.displayMoviesByGenre(genreId, page);
                     break;
 
-
                 case 3:
                     // TODO (BONUS): Get movie ID from user, then call movieService.displayMovieDetails()
-
-
+                    System.out.print("Enter movie ID: ");
+                    Long movieId = scanner.nextLong();
+                    movieService.displayMovieDetails(movieId);
                     break;
 
                 case 0:

src/main/java/movie/apis/Movie.java

@@ -10,15 +10,79 @@ public class Movie {
 
     private Long id;
     private String title;
-    private List<Genre> genres;
-    private String images;
+    private List<String> genres;
+    private List<String> images;
     private String year;
-    private String imdbRating;
+    private String imdb_rating;
     private String country;
 
     // TODO: Create a constructor with all fields
+    public Movie(Long id, String title, List<String> genres, List<String> images,
+                 String year, String imdb_rating, String country) {
+        this.id = id;
+        this.title = title;
+        this.genres = genres;
+        this.images = images;
+        this.year = year;
+        this.imdb_rating = imdb_rating;
+        this.country = country;
+    }
 
     // TODO: Create a simple constructor with id and title only
+    public Movie(Long id, String title) {
+        this.id = id;
+        this.title = title;
+    }
+    public Movie() {
+    }
 
     // TODO: Create getters and setters for all fields
+    public Long getId() {
+        return id;
+    }
+    public void setId(Long id) {
+        this.id = id;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+    public void setTitle(String title) {
+        this.title = title;
+    }
+
+    public List<String> getGenres() {
+        return genres;
+    }
+    public void setGenres(List<String> genres) {
+        this.genres = genres;
+    }
+
+    public List<String> getImages() {
+        return images;
+    }
+    public void setImages(List<String> images) {
+        this.images = images;
+    }
+
+    public String getYear() {
+        return year;
+    }
+    public void setYear(String year) {
+        this.year = year;
+    }
+
+    public String getImdb_rating() {
+        return imdb_rating;
+    }
+    public void setImdb_rating(String imdb_rating) {
+        this.imdb_rating = imdb_rating;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+    public void setCountry(String country) {
+        this.country = country;
+    }
 }

src/main/java/movie/apis/MovieService.java

@@ -105,7 +105,27 @@ public class MovieService {
         // TODO: Write your code here
         // All parsing code must be inside try-catch
         try {
-            // Your code here
+            String jsonResponse = getMoviesByGenreList(genreId, page);
+
+            if (jsonResponse == null) {
+                System.out.println("No movies found.");
+                return;
+            }
+
+            JsonObject rootObject = JsonParser.parseString(jsonResponse).getAsJsonObject();
+            JsonArray moviesArray = rootObject.getAsJsonArray("movies");
+
+            for (JsonElement element : moviesArray) {
+                JsonObject movieObject = element.getAsJsonObject();
+                Long id = movieObject.get("id").getAsLong();
+                String title = movieObject.get("title").getAsString();
+                String year = movieObject.get("year").getAsString();
+
+                System.out.println("ID: " + id + " | " + title + " (" + year + ")");
+            }
+
+            System.out.println("Total: " + rootObject.get("total").getAsInt());
+            System.out.println("Total Pages: " + rootObject.get("total_pages").getAsInt());
 
         } catch (Exception e) {
             System.err.println("ERROR: " + e.getMessage());
@@ -120,12 +140,17 @@ public class MovieService {
     private String getMovieById(Long movieId) {
         try {
             // TODO: Complete this method
-            // String url = MOVIE_BY_ID_URL + movieId;
-            // HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
-            // HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
-            // if (response.statusCode() == 200) return response.body();
+            String url = MOVIE_BY_ID_URL + movieId;
+            HttpRequest request = HttpRequest.newBuilder().uri(URI.create(url)).build();
+            HttpResponse<String> response = client.send(request, HttpResponse.BodyHandlers.ofString());
+            if (response.statusCode() == 200){
+                return response.body();
+            }
+            else {
+                System.out.println("Unable to fetch movie details. Status code: " + response.statusCode());
+                return null;
+            }
 
-            return null;
         } catch (Exception e) {
             System.out.println("!!Exception : " + e.getMessage());
         }