Database module migrate

Database module migration from class to functions within database namespace Signed-off-by: Guru Mehar Rachaputi <[email protected]>
cieslarmichal · Jun 23, 2024 · 2e04b14 · 2e04b14
1 parent e424f4e
commit 2e04b14
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 24 deletions.
diff --git a/include/faker-cxx/Database.h b/include/faker-cxx/Database.h
@@ -2,11 +2,8 @@
 
 #include <string_view>
 
-namespace faker
+namespace faker::database
 {
-class Database
-{
-public:
     /**
      * @brief Returns a random database column name.
      *
@@ -16,7 +13,7 @@ class Database
      * Database::columnName() // "created_at"
      * @endcode
      */
-    static std::string_view columnName();
+    std::string_view columnName();
 
     /**
      * @brief Returns a random database column type.
@@ -27,7 +24,7 @@ class Database
      * Database::columnType() // "timestamp"
      * @endcode
      */
-    static std::string_view columnType();
+    std::string_view columnType();
 
     /**
      * @brief Returns a random database collation.
@@ -38,7 +35,7 @@ class Database
      * Database::collation() // "utf8_unicode_ci"
      * @endcode
      */
-    static std::string_view collation();
+    std::string_view collation();
 
     /**
      * @brief Returns a random database engine.
@@ -49,7 +46,7 @@ class Database
      * Database::engine() // "ARCHIVE"
      * @endcode
      */
-    static std::string_view engine();
+    std::string_view engine();
 
     /**
      * @brief Returns a MongoDB Object Id.
@@ -60,6 +57,5 @@ class Database
      * Database::mongoDbObjectId() // "e175cac316a79afdd0ad3afb"
      * @endcode
      */
-    static std::string mongoDbObjectId();
-};
+    std::string mongoDbObjectId();
 }
diff --git a/src/modules/database/Database.cpp b/src/modules/database/Database.cpp
@@ -8,29 +8,29 @@
 #include "faker-cxx/String.h"
 #include "faker-cxx/types/Hex.h"
 
-namespace faker
+namespace faker::database
 {
-std::string_view Database::columnName()
+std::string_view columnName()
 {
     return Helper::arrayElement(columnNames);
 }
 
-std::string_view Database::columnType()
+std::string_view columnType()
 {
     return Helper::arrayElement(columnTypes);
 }
 
-std::string_view Database::collation()
+std::string_view collation()
 {
     return Helper::arrayElement(collations);
 }
 
-std::string_view Database::engine()
+std::string_view engine()
 {
     return Helper::arrayElement(engines);
 }
 
-std::string Database::mongoDbObjectId()
+std::string mongoDbObjectId()
 {
     return String::hexadecimal(24, HexCasing::Lower, HexPrefix::None);
 }

diff --git a/src/modules/database/DatabaseData.h b/src/modules/database/DatabaseData.h
@@ -3,7 +3,7 @@
 #include <array>
 #include <string_view>
 
-namespace faker
+namespace faker::database
 {
 const auto collations = std::to_array<std::string_view>({
     "utf8_unicode_ci",  "utf8_general_ci",  "utf8_bin",

diff --git a/tests/modules/database/DatabaseTest.cpp b/tests/modules/database/DatabaseTest.cpp
@@ -10,6 +10,7 @@
 
 using namespace ::testing;
 using namespace faker;
+using namespace faker::database;
 
 class DatabaseTest : public Test
 {
@@ -18,41 +19,41 @@ class DatabaseTest : public Test
 
 TEST_F(DatabaseTest, shouldGenerateColumnName)
 {
-    const auto generatedColumnName = Database::columnName();
+    const auto generatedColumnName = columnName();
 
     ASSERT_TRUE(std::ranges::any_of(columnNames, [generatedColumnName](const std::string_view& columnName)
                                     { return generatedColumnName == columnName; }));
 }
 
 TEST_F(DatabaseTest, shouldGenerateColumnType)
 {
-    const auto generatedColumnType = Database::columnType();
+    const auto generatedColumnType = columnType();
 
     ASSERT_TRUE(std::ranges::any_of(columnTypes, [generatedColumnType](const std::string_view& columnType)
                                     { return generatedColumnType == columnType; }));
 }
 
 TEST_F(DatabaseTest, shouldGenerateEngine)
 {
-    const auto generatedEngine = Database::engine();
+    const auto generatedEngine = engine();
 
     ASSERT_TRUE(std::ranges::any_of(engines, [generatedEngine](const std::string_view& engine)
                                     { return generatedEngine == engine; }));
 }
 
 TEST_F(DatabaseTest, shouldGenerateCollation)
 {
-    const auto generatedCollation = Database::collation();
+    const auto generatedCollation = collation();
 
     ASSERT_TRUE(std::ranges::any_of(collations, [generatedCollation](const std::string_view& collation)
                                     { return generatedCollation == collation; }));
 }
 
 TEST_F(DatabaseTest, shouldGenerateMongoDbObjectId)
 {
-    const auto mongoDbObjectId = Database::mongoDbObjectId();
+    const auto generatedMongoDbObjectId = mongoDbObjectId();
 
-    ASSERT_EQ(mongoDbObjectId.size(), 24);
-    ASSERT_TRUE(std::ranges::any_of(mongoDbObjectId, [](char hexNumberCharacter)
+    ASSERT_EQ(generatedMongoDbObjectId.size(), 24);
+    ASSERT_TRUE(std::ranges::any_of(generatedMongoDbObjectId, [](char hexNumberCharacter)
                                     { return hexLowerCharacters.find(hexNumberCharacter) != std::string::npos; }));
 }