Refactor/cliente cambiar campo address

app/migrations/0017_merge_20240605_0217.py

@@ -0,0 +1,14 @@
+# Generated by Django 5.0.4 on 2024-06-05 05:17
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0015_merge_20240603_1125'),
+        ('app', '0016_delete_veterinario'),
+    ]
+
+    operations = [
+    ]

app/migrations/0018_remove_client_address_client_city.py

@@ -0,0 +1,23 @@
+# Generated by Django 5.0.4 on 2024-06-05 05:18
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('app', '0017_merge_20240605_0217'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='client',
+            name='address',
+        ),
+        migrations.AddField(
+            model_name='client',
+            name='city',
+            field=models.CharField(choices=[('La Plata', 'La Plata'), ('Berisso', 'Berisso'), ('Ensenada', 'Ensenada')], default=1, max_length=35),
+            preserve_default=False,
+        ),
+    ]

app/models.py

@@ -4,6 +4,13 @@
 from django.db import IntegrityError, models
 
 
+class CityEnum(models.TextChoices):
+    LA_PLATA = 'La Plata',
+    BERISSO = 'Berisso',
+    ENSENADA = 'Ensenada',
+
+
+
 def validate_client(data):
     """
     Esta función valida los datos del cliente.
@@ -13,6 +20,7 @@ def validate_client(data):
     name = data.get("name", "")
     phone = data.get("phone", "")
     email = data.get("email", "")
+    city = data.get("city", "")
 
     if name == "":
         errors["name"] = "Por favor ingrese un nombre"
@@ -25,13 +33,18 @@ def validate_client(data):
     elif "@vetsoft.com" not in email:
         errors["email"] = "El email debe ser de la forma @vetsoft.com"
 
+    if city == "" or city is None:
+        errors["city"] = "Por favor ingrese una ciudad"
+    elif city not in dict(CityEnum.choices):
+        errors["city"] = "Por favor ingrese una ciudad valida"
+
     return errors
 
 class Client(models.Model):
     name = models.CharField(max_length=100)
     phone = models.CharField(max_length=15)
     email = models.EmailField()
-    address = models.CharField(max_length=100, blank=True)
+    city = models.CharField(max_length=35, choices=CityEnum.choices)
 
     def __str__(self):
         """
@@ -61,13 +74,12 @@ def save_client(cls, client_data):
             name=client_data.get("name"),
             phone=client_data.get("phone"),
             email=client_data.get("email"),
-            address=client_data.get("address"),
+            city=client_data.get("city"),
         )
 
         return True, None
 
     def update_client(self, client_data):
-
         """
         Actualiza los datos de un cliente existente.
 
@@ -77,21 +89,22 @@ def update_client(self, client_data):
         Esta función actualiza el cliente. 
         """
         errors = validate_client(client_data)
-
+   
         if len(errors) > 0:
             return False, errors
 
         self.name = client_data.get("name", "") or self.name
         self.email = client_data.get("email", "") or self.email
         self.phone = client_data.get("phone", "") or self.phone
-        self.address = client_data.get("address", "") or self.address
+        self.city = client_data.get("city", "") or self.city
 
         try:
             self.save()
             return True, None
         except (IntegrityError, ValidationError) as e:
             return False, {"error": str(e)}
 
+
 def validate_provider(data):
     """
     Valida los datos del proveedor.

app/templates/clients/form.html

@@ -66,21 +66,21 @@ <h1>Nuevo Cliente</h1>
                     {% endif %}
                 </div>
                 <div>
-                    <label for="address" class="form-label">Direccion</label>
-                    <input type="text"
-                        id="address"
-                        name="address"
-                        class="form-control {% if errors.address %}is-invalid{% endif %}"
-                        value="{{ client.address }}"
-                        required/>
-
-                    {% if errors.address %}
-                        <div class="invalid-feedback">
-                            {{ errors.address }}
-                        </div>
+                    <label for="city" class="form-label">Ciudad</label>
+                    <select id="city" name="city" class="form-select" required>
+                        <option value="" disabled selected>Seleccione una ciudad</option>
+                        {% for id_city, city in ciudades %}
+                            <option value="{{ id_city }}" {% if client.city == id_city %}selected{% endif %}>
+                                {{ city }}
+                            </option>
+                        {% endfor %}
+                    </select>
+                    {% if errors.city %}
+                    <div class="invalid-feedback">{{ errors.city }}</div>
                     {% endif %}
                 </div>
 
+
                 <button class="btn btn-primary">Guardar</button>
             </form>
         </div>

app/templates/clients/repository.html

@@ -17,7 +17,7 @@ <h1 class="mb-4">Clientes</h1>
                 <th>Nombre</th>
                 <th>Teléfono</th>
                 <th>Email</th>
-                <th>Dirección</th>
+                <th>Ciudad</th>
                 <th></th>
             </tr>
         </thead>
@@ -28,7 +28,7 @@ <h1 class="mb-4">Clientes</h1>
                     <td>{{client.name}}</td>
                     <td>{{client.phone}}</td>
                     <td>{{client.email}}</td>
-                    <td>{{client.address}}</td>
+                    <td>{{client.city}}</td>
                     <td>
                         <a class="btn btn-outline-primary"
                            href="{% url 'clients_edit' id=client.id %}"

app/tests_integration.py

@@ -51,18 +51,17 @@ def test_can_create_client(self):
             reverse("clients_form"),
             data={
                 "name": "Juan Sebastian Veron",
-                "phone": "221555232",
-                "address": "13 y 44",
+                "phone": "54221555232",
                 "email": "[email protected]",
+                "city": "La Plata",
             },
         )
         clients = Client.objects.all()
         self.assertEqual(len(clients), 1)
-
         self.assertEqual(clients[0].name, "Juan Sebastian Veron")
-        self.assertEqual(clients[0].phone, "221555232")
-        self.assertEqual(clients[0].address, "13 y 44")
+        self.assertEqual(clients[0].phone, "54221555232")
         self.assertEqual(clients[0].email, "[email protected]")
+        self.assertEqual(clients[0].city, "La Plata")
 
         self.assertRedirects(response, reverse("clients_repo"))
 
@@ -78,6 +77,7 @@ def test_validation_errors_create_client(self):
         self.assertContains(response, "Por favor ingrese un nombre")
         self.assertContains(response, "Por favor ingrese un teléfono")
         self.assertContains(response, "Por favor ingrese un email")
+        self.assertContains(response, "Por favor ingrese una ciudad")
 
     def test_should_response_with_404_status_if_client_doesnt_exists(self):
         """
@@ -95,42 +95,68 @@ def test_validation_invalid_email(self):
             data={
                 "name": "Juan Sebastian Veron",
                 "phone": "221555232",
-                "email": "[email protected]",
-                "address": "13 y 44",
+                "city": "La Plata",
+                "email": "brujita75",
             },
         )
         self.assertContains(response, "El email debe ser de la forma @vetsoft.com")
 
-    def test_edit_user_with_valid_data(self):
-        """
-        Esta función testea que se pueda editar el usuario datos validos.
+    def test_edit_user_with_valid_data_test(self):
+        """"
+        test para editar un cliente con datos validos.
         """
         client = Client.objects.create(
-            name="Juan Sebastián Veron",
-            address="13 y 44",
-            phone="221555232",
-            email="brujita75@vetsoft.com",
+            name="Guido Carrillo",
+            city="La Plata",
+            phone="54221555232",
+            email="guido@vetsoft.com",
         )
 
         response = self.client.post(
             reverse("clients_form"),
-            data={
+              data={
                 "id": client.id,
-                "name": "Guido Carrillo",
-                "address": "13 y 44",
-                "phone":"221555232",
-                "email": "[email protected]",
+                "name": "Juan Sebastian Veron",
+                "phone": "221456789",
+                "email": "[email protected]",
+                "city": "Berisso",
+
             },
         )
 
         # redirect after post
         self.assertEqual(response.status_code, 302)
 
         editedClient = Client.objects.get(pk=client.id)
-        self.assertEqual(editedClient.name, "Guido Carrillo")
-        self.assertEqual(editedClient.phone, client.phone)
-        self.assertEqual(editedClient.address, client.address)
-        self.assertEqual(editedClient.email, client.email)
+        self.assertEqual(editedClient.name, "Juan Sebastian Veron")
+        self.assertEqual(editedClient.email, "[email protected]")
+        self.assertEqual(editedClient.phone, "221456789")
+        self.assertEqual(editedClient.city, "Berisso")
+
+    def test_edit_user_with_invalid_data_test_city(self):
+
+        client = Client.objects.create(
+            name="Guido Carrillo",
+            city="La Plata",
+            phone="221456789",
+            email="[email protected]",
+        )
+
+
+        self.client.post(
+            reverse("clients_form"),
+            data={
+                "id": client.id,
+                "name": "Juan Sebastian Veron",
+                "phone": "221456789",
+                "city": "Rosario",
+                "email": "[email protected]",
+            },
+        )
+
+        # redirect after post
+        editedClient = Client.objects.get(pk=client.id)
+        self.assertEqual(editedClient.city, "La Plata")
 
 class MedicineIntegrationTest(TestCase):
     def test_can_create_medicine(self):

app/tests_unit.py

@@ -14,45 +14,42 @@ def test_can_create_and_get_client(self):
             {
                 "name": "Juan Sebastian Veron",
                 "phone": "221555232",
-                "address": "13 y 44",
+                "city": "La Plata",
                 "email": "[email protected]",
             },
-
         )
         clients = Client.objects.all()
         self.assertEqual(len(clients), 1)
 
         self.assertEqual(clients[0].name, "Juan Sebastian Veron")
         self.assertEqual(clients[0].phone, "221555232")
-        self.assertEqual(clients[0].address, "13 y 44")
+        self.assertEqual(clients[0].city, "La Plata")
         self.assertEqual(clients[0].email, "[email protected]")
 
     def test_can_update_client(self):
-        """
-        Prueba la actualización de un cliente.
-        Esta función testea si se puede actualizar el cliente.
-        """
+
         Client.save_client(
             {
                 "name": "Juan Sebastian Veron",
                 "phone": "221555232",
-                "address": "13 y 44",
                 "email": "[email protected]",
+                "city": "La Plata",
             },
         )
         client = Client.objects.get(pk=1)
 
-        self.assertEqual(client.phone, "221555232")
-
-        client.update_client(
-                {"name": "Juan Sebastian Veron",
-                "phone": "221555233",
-                "address": "13 y 44",
-                "email": "[email protected]"})
+        client.update_client(  {
+                "name": "Juan Sebastian Veron",
+                "phone": "221555232",
+                "email": "[email protected]",
+                "city": "Berisso",
+            },)
 
         client_updated = Client.objects.get(pk=1)
 
-        self.assertEqual(client_updated.phone, "221555233")
+        self.assertEqual(client_updated.phone, "221555232")
+        self.assertEqual(client_updated.email, "[email protected]")
+        self.assertEqual(client_updated.city, "Berisso")
 
     def test_update_client_with_error(self):
         """
@@ -63,7 +60,7 @@ def test_update_client_with_error(self):
             {
                 "name": "Juan Sebastian Veron",
                 "phone": "221555232",
-                "address": "13 y 44",
+                "city": "La Plata",
                 "email": "[email protected]",
             },
         )
@@ -82,7 +79,7 @@ def test_update_client_with_email_null(self): #nuevo test verificando que no pue
             {
                 "name": "Juan Sebastian Veron",
                 "phone": "221555232",
-                "address": "13 y 44",
+                "city": "La Plata",
                 "email": "[email protected]",
             },
         )
@@ -165,7 +162,7 @@ def test_can_create_and_get_provider(self):
         Provider.save_provider(
             {
                 "name": "Juan Roman Riquelme",
-                "email": "senor10@gmail.com",
+                "email": "senor10@vetsoft.com",
                 "address": "13 y 44",
             },
         )
@@ -174,7 +171,7 @@ def test_can_create_and_get_provider(self):
 
         self.assertEqual(providers[0].name, "Juan Roman Riquelme")
         self.assertEqual(providers[0].address, "13 y 44")
-        self.assertEqual(providers[0].email, "senor10@gmail.com")
+        self.assertEqual(providers[0].email, "senor10@vetsoft.com")
 
     #Agrego test unitario especifico de la issue de provider
     def test_provider_address(self):
@@ -187,7 +184,7 @@ def test_provider_address(self):
         Provider.save_provider(
             {
                 "name": "Juan Roman Riquelme",
-                "email": "senor10@gmail.com",
+                "email": "senor10@vetsoft.com",
                 "address": addres, #guardo proveedor con direccion especifica
             },
         )