Refactored Movies (cieslarmichal#583)

* Refactored actors and actresses Signed-off-by: Uilian Ries <[email protected]> * Add more movie data Signed-off-by: Uilian Ries <[email protected]> * Add movie data to cmake lists Signed-off-by: Uilian Ries <[email protected]> * Update movies test Signed-off-by: Uilian Ries <[email protected]> --------- Signed-off-by: Uilian Ries <[email protected]>
00thirdeye00 · Jun 20, 2024 · f4ec12b · f4ec12b
1 parent 9a59078
commit f4ec12b
Show file tree

Hide file tree

Showing 12 changed files with 1,347 additions and 1,361 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -40,6 +40,7 @@ set(FAKER_SOURCES
     src/modules/lorem/Lorem.cpp
     src/modules/medicine/Medicine.cpp
     src/modules/movie/Movie.cpp
+    src/modules/movie/MovieData.cpp
     src/modules/music/Music.cpp
     src/modules/number/Number.cpp
     src/modules/person/Person.cpp
@@ -52,7 +53,6 @@ set(FAKER_SOURCES
     src/modules/videoGame/VideoGame.cpp
     src/modules/weather/Weather.cpp
     src/modules/word/Word.cpp
-
     src/common/FormatHelper.cpp
     src/common/LuhnCheck.cpp
     src/common/StringHelper.cpp

diff --git a/include/faker-cxx/Movie.h b/include/faker-cxx/Movie.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include <string>
+#include <string_view>
 
 namespace faker
 {
@@ -16,7 +16,7 @@ class Movie
      * Movie::genre() // "Drama"
      * @endcode
      */
-    static std::string genre();
+    static std::string_view genre();
 
     /**
      * @brief Returns a random movie title.
@@ -27,7 +27,7 @@ class Movie
      * Movie::movieTitle() // "Pulp Fiction"
      * @endcode
      */
-    static std::string movieTitle();
+    static std::string_view movieTitle();
 
     /**
      * @brief Returns a random tv show.
@@ -38,7 +38,7 @@ class Movie
      * Movie::tvShow() // "The Sopranos"
      * @endcode
      */
-    static std::string tvShow();
+    static std::string_view tvShow();
 
     /**
      * @brief Returns a random movie director name.
@@ -49,7 +49,7 @@ class Movie
      * Movie::director() // "Quentin Tarantino"
      * @endcode
      */
-    static std::string director();
+    static std::string_view director();
 
     /**
      * @brief Returns a random actor name.
@@ -60,7 +60,7 @@ class Movie
      * Movie::actor() // "John Travolta"
      * @endcode
      */
-    static std::string actor();
+    static std::string_view actor();
 
     /**
      * @brief Returns a random actress name.
@@ -71,6 +71,6 @@ class Movie
      * Movie::actress() // "Scarlett Johansson"
      * @endcode
      */
-    static std::string actress();
+    static std::string_view actress();
 };
 }
diff --git a/src/modules/movie/Movie.cpp b/src/modules/movie/Movie.cpp
@@ -1,43 +1,38 @@
 #include "faker-cxx/Movie.h"
 
-#include "data/Actors.h"
-#include "data/Actresses.h"
-#include "data/Directors.h"
-#include "data/Genres.h"
-#include "data/Movies.h"
-#include "data/TvShows.h"
+#include "MovieData.h"
 #include "faker-cxx/Helper.h"
 
 namespace faker
 {
-std::string Movie::genre()
+std::string_view Movie::genre()
 {
-    return Helper::arrayElement<std::string>(genres);
+    return Helper::arrayElement(genres);
 }
 
-std::string Movie::movieTitle()
+std::string_view Movie::movieTitle()
 {
-    return Helper::arrayElement<std::string>(movies);
+    return Helper::arrayElement(movies);
 }
 
-std::string Movie::tvShow()
+std::string_view Movie::tvShow()
 {
-    return Helper::arrayElement<std::string>(tvShows);
+    return Helper::arrayElement(tvShows);
 }
 
-std::string Movie::director()
+std::string_view Movie::director()
 {
-    return Helper::arrayElement<std::string>(directors);
+    return Helper::arrayElement(directors);
 }
 
-std::string Movie::actor()
+std::string_view Movie::actor()
 {
-    return Helper::arrayElement<std::string>(actors);
+    return Helper::arrayElement(actors);
 }
 
-std::string Movie::actress()
+std::string_view Movie::actress()
 {
-    return Helper::arrayElement<std::string>(actresses);
+    return Helper::arrayElement(actresses);
 }
 
 }