Merge pull request 'HW-03-oop-and-api' (#1) from develop into main

Reviewed-on: Mobina/HW-03-oop-and-api#1

100 / 100 + Bonus

.idea/gradle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="parallelModelFetch" value="true" />
+  </component>
+</project>

.idea/misc.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ExternalStorageConfigurationManager" enabled="true" />
   <component name="MavenProjectsManager">
     <option name="originalFiles">
       <list>

src/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/HW-03-oop-and-api.iml" filepath="$PROJECT_DIR$/HW-03-oop-and-api.iml" />
+    </modules>
+  </component>
+</project>

src/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/.." vcs="Git" />
+  </component>
+</project>

src/main/java/Rational/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/main/java/Rational/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/main/java/Rational/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Rational.iml" filepath="$PROJECT_DIR$/Rational.iml" />
+    </modules>
+  </component>
+</project>

src/main/java/Rational/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

src/main/java/Rational/Rational.java

@@ -52,44 +52,48 @@ 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
+        Rational r= new Rational(this.numerator, this.denominator);
+        other.numerator=-other.numerator;
+        return add(r, other);
     }
 
     // TODO: Static method - r1 - r2
     public static Rational subtract(Rational r1, Rational r2) {
         // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        return r1.subtract(r2);
     }
 
     // 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 newNumerator= this.numerator*other.numerator;
+        int newDenominator= this.denominator*other.denominator;
+        return new Rational(newNumerator, newDenominator);
     }
 
     // TODO: Static method - r1 * r2
     public static Rational multiply(Rational r1, Rational r2) {
         // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        return r1.multiply(r2);
     }
 
     // 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 IllegalArgumentException("Denominator cannot be zero");
+        int newNum= other.denominator;
+        int newDen= other.numerator;
+        Rational r1=new Rational(newNum, newDen);
+        Rational r2=new Rational(this.numerator, this.denominator);
+        return multiply(r2,r1);
     }
 
     // TODO: Static method - r1 / r2
     public static Rational divide(Rational r1, Rational r2) {
         // YOUR CODE HERE
-        return null; // Remove this line when implemented
+        return r1.divide(r2);
     }
 
     //  PROVIDED - String representation

src/main/java/Rational/out/production/Rational/Rational/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/main/java/Rational/out/production/Rational/Rational/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/main/java/Rational/out/production/Rational/Rational/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Rational.iml" filepath="$PROJECT_DIR$/Rational.iml" />
+    </modules>
+  </component>
+</project>

src/main/java/Rational/out/production/Rational/Rational/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

src/main/java/movie/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/main/java/movie/.idea/.name

@@ -0,0 +1 @@
+MovieService.java

src/main/java/movie/.idea/gradle.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
+  <component name="GradleSettings">
+    <option name="parallelModelFetch" value="true" />
+  </component>
+</project>

src/main/java/movie/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/main/java/movie/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/movie.iml" filepath="$PROJECT_DIR$/movie.iml" />
+    </modules>
+  </component>
+</project>

src/main/java/movie/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

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

@@ -9,6 +9,7 @@ public class Main {
 
     public static void main(String[] args) {
         System.out.println("\n=== MOVIE API CLIENT ===\n");
+        Scanner in = new Scanner(System.in);
 
         boolean running = true;
         while (running) {
@@ -22,13 +23,21 @@ public class Main {
 
                 case 2:
                     // TODO: Get genre ID and page from user, then call movieService.displayMoviesByGenre()
+                    System.out.println("Enter genre ID:");
+                    long genreID= in.nextLong();
+                    System.out.println("Enter page:");
+                    long page= in.nextLong();
+
+                    movieService.displayMoviesByGenre(genreID, page);
 
                     break;
 
 
                 case 3:
                     // TODO (BONUS): Get movie ID from user, then call movieService.displayMovieDetails()
-
+                    System.out.println("Enter genre ID:");
+                    long ID= in.nextLong();
+                    movieService.displayMovieDetails(ID);
 
                     break;
 

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

@@ -17,8 +17,51 @@ public class Movie {
     private String country;
 
     // TODO: Create a constructor with all fields
+    public Movie(long id, String title, List<Genre> genres, String images, String year,String imdbRating, String country)
+    {
+        this.id=id;
+        this.country=country;
+        this.genres=genres;
+        this.images=images;
+        this.year=year;
+        this.title=title;
+        this.imdbRating=imdbRating;
+    }
 
     // TODO: Create a simple constructor with id and title only
+    public Movie(long id, String title)
+    {
+        this.id=id;
+        this.title=title;
+    }
 
     // TODO: Create getters and setters for all fields
+
+    public Long getId() {
+        return id;
+    }
+
+    public String getCountry() {
+        return country;
+    }
+
+    public String getImages() {
+        return images;
+    }
+
+    public String getImdbRating() {
+        return imdbRating;
+    }
+
+    public String getTitle() {
+        return title;
+    }
+
+    public String getYear() {
+        return year;
+    }
+
+    public List<Genre> getGenres() {
+        return genres;
+    }
 }

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

@@ -105,7 +105,12 @@ public class MovieService {
         // TODO: Write your code here
         // All parsing code must be inside try-catch
         try {
-            // Your code here
+            String json= getMoviesByGenreList(genreId, page);
+            if (json==null)
+            {
+                System.out.println("Failed to get movie details for ID: " + genreId);
+                return;
+            }
 
         } catch (Exception e) {
             System.err.println("ERROR: " + e.getMessage());
@@ -120,18 +125,22 @@ 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();
-
-            return null;
+            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("error");
+                return null;
+            }
         } catch (Exception e) {
             System.out.println("!!Exception : " + e.getMessage());
         }
         return null;
     }
-    
+
     /**
      * BONUS TODO: Display complete movie details for a given movie ID
      *
@@ -171,14 +180,24 @@ public class MovieService {
         // Step 3-6: Parse JSON and display details (PUT YOUR CODE INSIDE try-catch)
         try {
             // TODO: Parse jsonResponse to JsonObject
-            // TODO: Extract id, title, year, genres array, poster, country, imdb_rating
+            JsonObject object= JsonParser.parseString(jsonResponse).getAsJsonObject();
+
+            // TODO: Extract id, title, year, genres   array, poster, country, imdb_rating
+            int ID=object.get("id").getAsInt();
+            String title= object.get("title").getAsString();
+            String year= object.get("year").getAsString();
+            String poster= object.get("poster").getAsString();
+            String country= object.get("country").getAsString();
+            int imbd= object.get("imbd_rating").getAsInt();
+            JsonArray genreArray= object.getAsJsonArray("genres");
+
             // TODO: Convert genres array to a readable string
             // TODO: Print all movie details
-            // HINT: Use JsonParser.parseString(jsonResponse).getAsJsonObject()
-            // HINT: Use getAsJsonArray("genres") to get genres
-            // HINT: For each genre, use getAsString()
-
-            // Your code here:
+            System.out.println("title: "+ title+ "\nyear: "+ year+ "\ncountrey: "+ country+"\nIMBD: "+ imbd+ "\ngenres: ");
+            for (int i=0; i<genreArray.size(); i++)
+            {
+                System.out.print(genreArray.get(i)+"  ");
+            }
 
 
         } catch (Exception e) {

src/out/production/HW-03-oop-and-api/Rational/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/out/production/HW-03-oop-and-api/Rational/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/Rational/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Rational.iml" filepath="$PROJECT_DIR$/Rational.iml" />
+    </modules>
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/Rational/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/Rational/out/production/Rational/Rational/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/out/production/HW-03-oop-and-api/Rational/out/production/Rational/Rational/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/Rational/out/production/Rational/Rational/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/Rational.iml" filepath="$PROJECT_DIR$/Rational.iml" />
+    </modules>
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/Rational/out/production/Rational/Rational/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/movie/.idea/.gitignore

@@ -0,0 +1,10 @@
+# Default ignored files
+/shelf/
+/workspace.xml
+# Ignored default folder with query files
+/queries/
+# Datasource local storage ignored files
+/dataSources/
+/dataSources.local.xml
+# Editor-based HTTP Client requests
+/httpRequests/

src/out/production/HW-03-oop-and-api/movie/.idea/gradle.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="GradleSettings">
+    <option name="parallelModelFetch" value="true" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/movie/.idea/misc.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="17" project-jdk-type="JavaSDK">
+    <output url="file://$PROJECT_DIR$/out" />
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/movie/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/movie.iml" filepath="$PROJECT_DIR$/movie.iml" />
+    </modules>
+  </component>
+</project>

src/out/production/HW-03-oop-and-api/movie/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$/../../../.." vcs="Git" />
+  </component>
+</project>