From a88c4a35456e122bad8f2e3951edbfc3984e5859 Mon Sep 17 00:00:00 2001
From: Serhii Prodan <22973227+serpro69@users.noreply.github.com>
Date: Sun, 19 May 2024 21:43:50 +0200
Subject: [PATCH] Fix Company.name->Name references

---
 .../github/serpro69/kfaker/provider/NameIT.kt |  7 +++++++
 core/src/main/resources/locales/uk.yml        | 21 +++++++++++--------
 .../kfaker/commerce/provider/CompanyIT.kt     | 16 ++++++++++++--
 3 files changed, 33 insertions(+), 11 deletions(-)

diff --git a/core/src/integration/kotlin/io/github/serpro69/kfaker/provider/NameIT.kt b/core/src/integration/kotlin/io/github/serpro69/kfaker/provider/NameIT.kt
index cffe83b47..32b74346a 100644
--- a/core/src/integration/kotlin/io/github/serpro69/kfaker/provider/NameIT.kt
+++ b/core/src/integration/kotlin/io/github/serpro69/kfaker/provider/NameIT.kt
@@ -9,6 +9,13 @@ class NameIT : DescribeSpec({
     describe("Name provider") {
         val name: (locale: String) -> Name = { faker { fakerConfig { locale = it } }.name }
 
+        context("uk locale") {
+            it("generates a name") {
+                val names = List(42) { name("uk").name() }
+                names shouldNotContain ""
+            }
+        }
+
         context("ru locale") {
             it("generates lastName") {
                 val lastNames = List(42) { name("ru").lastName() }
diff --git a/core/src/main/resources/locales/uk.yml b/core/src/main/resources/locales/uk.yml
index 666da833c..35ba48d95 100644
--- a/core/src/main/resources/locales/uk.yml
+++ b/core/src/main/resources/locales/uk.yml
@@ -420,7 +420,7 @@ uk:
         - zt.ua
         - укр
     name:
-      male_first_name: &1
+      male_first_name: &male_first_name # NB! do not change anchor name
         - Августин
         - Аврелій
         - Адам
@@ -733,7 +733,7 @@ uk:
         - Юрійович
         - Юхимович
         - Ярославович
-      male_last_name: &2
+      male_last_name: &male_last_name # NB! do not change anchor name
         - Андрухович
         - Бабух
         - Балабан
@@ -973,7 +973,7 @@ uk:
         - Яцишин
         - Яцьків
         - Ящук
-      female_first_name:
+      female_first_name: &female_first_name # NB! do not change anchor name
         - Аврелія
         - Аврора
         - Агапія
@@ -1284,7 +1284,7 @@ uk:
         - Юріївна
         - Юхимівна
         - Ярославівна
-      female_last_name:
+      female_last_name: &female_last_name # NB! do not change anchor name
         - Андрухович
         - Бабух
         - Балабан
@@ -1515,8 +1515,12 @@ uk:
         - Яцишина
         - Яцьків
         - Ящук
-      first_name: *1
-      last_name: *2
+      first_name: # NB! do not change anchor references, we should include both female and male first names here
+        - *male_first_name
+        - *female_first_name
+      last_name: # NB! do not change anchor references, we should include both female and male last names here
+        - *male_last_name
+        - *female_last_name
       name:
         - "#{male_first_name} #{male_last_name}"
         - "#{male_last_name} #{male_first_name}"
@@ -1784,9 +1788,8 @@ uk:
         - скло
         - дерево
       name:
-        - "#{prefix} #{Name.female_first_name}"
-        - "#{prefix} #{Name.male_first_name}"
-        - "#{prefix} #{Name.male_last_name}"
+        - "#{prefix} #{Name.first_name}" # NB! do not change, see #239
+        - "#{prefix} #{Name.last_name}" # NB! do not change, see #239
         - "#{prefix} #{Address.city}#{product}#{suffix}" # NB! do not change, see #239
         - "#{prefix} #{Address.city}#{suffix}" # NB! do not change, see #239
     music:
diff --git a/faker/commerce/src/integration/kotlin/io/github/serpro69/kfaker/commerce/provider/CompanyIT.kt b/faker/commerce/src/integration/kotlin/io/github/serpro69/kfaker/commerce/provider/CompanyIT.kt
index 0830a1aa0..26f3e55eb 100644
--- a/faker/commerce/src/integration/kotlin/io/github/serpro69/kfaker/commerce/provider/CompanyIT.kt
+++ b/faker/commerce/src/integration/kotlin/io/github/serpro69/kfaker/commerce/provider/CompanyIT.kt
@@ -10,8 +10,10 @@ class CompanyIT : DescribeSpec({
         val company: (locale: String) -> Company = { faker { fakerConfig { locale = it } }.company }
 
         context("uk locale") {
-            it("should generate a valid name") {
-                shouldNotThrow<NoSuchElementException> { company("uk").name() shouldNotBe "" }
+            repeat(10) {
+                it("should generate a valid name run#$it") {
+                    shouldNotThrow<NoSuchElementException> { company("uk").name() shouldNotBe "" }
+                }
             }
         }
 
@@ -22,3 +24,13 @@ class CompanyIT : DescribeSpec({
         }
     }
 })
+
+fun main() {
+    val f = io.github.serpro69.kfaker.faker { fakerConfig { locale = "uk" } }
+    repeat(100) {
+        println("""
+        ${f.name.firstName()} ${f.name.lastName()}
+        """
+        )
+    }
+}