• This project
    • Loading...
  • Sign in

Marta Miranda / boletin_api

Logo codes
Go to a project
Toggle navigation
  • Projects
  • Groups
  • Snippets
  • Help
Toggle navigation pinning
  • Project
  • Activity
  • Repository
  • Pipelines
  • Graphs
  • Issues 0
  • Merge Requests 0
  • Wiki
  • Network
  • Create a new issue
  • Builds
  • Commits
Closed
Merge Request !29 opened 2023-09-01 15:26:46 UTC by Enzo Yair@Ecardenez

Feature/#36 visibilizar includes y filtros

Edited 2023-09-04 10:00:30 UTC
Request to merge feature/#36_visibilizar_includes_y_filtros into develop
×

Check out, review, and merge locally

Step 1. Fetch and check out the branch for this merge request

git fetch origin
git checkout -b feature/#36_visibilizar_includes_y_filtros origin/feature/#36_visibilizar_includes_y_filtros

Step 2. Review the changes locally

Step 3. Merge the branch and fix any conflicts that come up

git checkout develop
git merge --no-ff feature/#36_visibilizar_includes_y_filtros

Step 4. Push the result of the merge to GitLab

git push origin develop

Note that pushing to GitLab requires write access to this repository.

Tip: You can also checkout merge requests locally by following these guidelines

Closed by Enzo Yair 2023-09-04 10:00:30 UTC

The changes were not merged into develop.

  • Discussion 4
  • Commits 3
  • Changes 8
  • Avatar
    Martín Miranda
    @debianitram started a discussion on the diff 2023-09-01 18:02:20 UTC
    Toggle discussion
    project/apps/edicto/api.py
     
    from .models import Edicto, Precio
    from .serializer import EdictoSerializer, PrecioSerializer
    from .filters import EdictoFilter
    from .filters import EdictoFilter, PrecioFilter
    from .pagination import CustomPagination
    from .permissions import IsAdminOrAuthorized
    from .utils import contador
    # from .precio import contador
    # from .precio import calculadora
    • Martín Miranda
      @debianitram commented 2023-09-01 18:02:20 UTC
      Developer

      Si no utilizas esa importación elimina, intenta no deja código inútil.

  • Avatar
    Martín Miranda
    @debianitram started a discussion on an outdated diff 2023-09-01 18:02:37 UTC
    Toggle discussion
    project/apps/edicto/api.py
    if not user.is_staff:
    raise serializers.ValidationError("El usuario no es parte del personal designado.")
    return super().create(request, *args, **kwargs)
    def retrieve(self, request, *args, **kwargs):
    instance = self.get_object()
    serializer = self.get_serializer(instance)
    data = serializer.data
    data['id'] = instance.id
    return Response(data)
    permission_classes = [IsAuthenticated, IsAdminOrAuthorized]
    filter_backends = (DjangoFilterBackend, filters.OrderingFilter)
    filterset_class = PrecioFilter
    ordering_fields = ('usuario__usuario', )
    • Martín Miranda
      @debianitram commented 2023-09-01 18:02:37 UTC
      Developer

      este ordering_fields está bien?

  • Avatar
    Martín Miranda
    @debianitram started a discussion on the diff 2023-09-01 18:03:43 UTC
    Toggle discussion
    project/apps/edicto/filters.py
    from django_filters import rest_framework as filters
     
    from edicto.models import Edicto
    from edicto.models import Edicto, Precio
     
     
    class EdictoFilter(filters.FilterSet):
    fecha_creacion__gte = filters.DateFilter(field_name="fecha_creacion", lookup_expr='gte', label='Desde')
    fecha_creacion__lte = filters.DateFilter(field_name="fecha_creacion", lookup_expr='lte', label='Hasta')
    class Meta:
    • Martín Miranda
      @debianitram commented 2023-09-01 18:03:43 UTC
      Developer

      acá podrías aplicar lo mismo que hiciste en PrecioFilter

  • Avatar
    Martín Miranda
    @debianitram started a discussion on the diff 2023-09-01 18:04:50 UTC
    Toggle discussion
    project/apps/edicto/utils.py
     
     
    def contador(edicto):
    expresiones = re.findall(r'\(\.\.\.', edicto)
    texto = edicto.split()
    cantidad_palabras = len(texto)
    cantidad_expresiones = len(expresiones)
    total_edicto = cantidad_palabras + cantidad_expresiones
    return total_edicto
    edicto_sin_guiones = re.sub(r'(?<!\w)-|-(?!\w)', ' ', edicto)
    palabras = re.split(r'\s+', edicto_sin_guiones)
    palabras_filtradas = [palabra for palabra in palabras if palabra.strip()]
    • Martín Miranda
      @debianitram commented 2023-09-01 18:04:50 UTC
      Developer

      el if palabra.strip() tiene algún sentido?

  • Enzo Yair
    @Ecardenez 2023-09-04 10:00:20 UTC

    Added 1 commit:

    • d638bcc6 - correcion de usuario__usuario en el filter de precio y eliminacion del metodo validate
  • Enzo Yair
    @Ecardenez 2023-09-04 10:00:30 UTC

    Status changed to closed

  • Please register or login to post a comment
Enzo Yair
Assignee
Enzo Yair @Ecardenez
Assign to
None
Milestone
None
Assign milestone
1
1 participant
Reference: mvmiranda/boletin_api!29