fix: Adapta parámetros de ID para localidades y asentamientos #232

Los asentamientos y las localidades, ambos provistos por BAHRA, han variado sus longitudes y podrían tener una longitud de ocho o diez caracteres. Los primeros son del tipo alfanuméricos y los segundos son numéricos.

Author: Pablo Andino

service/constants.py

@@ -27,6 +27,6 @@
 DEPT_ID_LEN = 5
 MUNI_ID_LEN = 6
 CENSUS_LOCALITY_ID_LEN = 8
-SETTLEMENT_ID_LEN = 10
-LOCALITY_ID_LEN = 11
+SETTLEMENT_ID_LEN = (8, 10)
+LOCALITY_ID_LEN = (8, 10)
 STREET_ID_LEN = 13

service/params.py

@@ -313,7 +313,40 @@ def _parse_value(self, val):
         return list(ids)
 
 
-class IdsAlphamericParameter(IdsParameter):
+class IdsTwoLengthParameter(IdsParameter):
+
+    def __init__(self, *two_length, padding_char='0', sep=','):
+        max_length = max(two_length)
+        min_length = min(two_length)
+        super().__init__(max_length, padding_char=padding_char, padding_length=max_length - min_length, sep=sep)
+        self._max_length = max_length
+        self._min_length = min_length
+
+    def _parse_value(self, val):
+        items = val.split(self._sep)
+        if len(items) > constants.MAX_RESULT_LEN:
+            raise ValueError(strings.ID_PARAM_LENGTH.format(
+                constants.MAX_RESULT_LEN))
+
+        ids = set()
+        for item in items:
+            item = item.strip()
+
+            if not item.isdigit() or len(item) > self._id_length:
+                raise ValueError(strings.ID_TWO_LENGTH_PARAM_INVALID.format(
+                    self._min_length, self._max_length))
+
+            id_length = self._id_length if len(item) > self._min_length else self._min_length
+            item = item.rjust(id_length, self._padding_char)
+            if item in ids:
+                raise ValueError(strings.ID_PARAM_UNIQUE.format(item))
+
+            ids.add(item)
+
+        return list(ids)
+
+
+class IdsAlphamericTwoLengthParameter(IdsTwoLengthParameter):
 
     def _parse_value(self, val):
         items = val.split(self._sep)
@@ -325,10 +358,12 @@ def _parse_value(self, val):
         for item in items:
             item = item.strip()
 
-            if len(item) > self._id_length or len(item) < self._min_length:
-                raise ValueError(strings.ID_ALPHAMERIC_PARAM_INVALID.format(
+            if len(item) > self._id_length:
+                raise ValueError(strings.ID_ALPHAMERIC_TWO_LENGTH_PARAM_INVALID.format(
                     self._min_length, self._id_length))
 
+            id_length = self._id_length if len(item) > self._min_length else self._min_length
+            item = item.rjust(id_length, self._padding_char)
             if item in ids:
                 raise ValueError(strings.ID_PARAM_UNIQUE.format(item))
 
@@ -1212,7 +1247,7 @@ def parse_get_params(self, qs_params):
 )
 
 PARAMS_SETTLEMENTS = EndpointParameters(shared_params={
-    N.ID: IdsAlphamericParameter(id_length=constants.SETTLEMENT_ID_LEN, padding_length=2),
+    N.ID: IdsAlphamericTwoLengthParameter(*constants.SETTLEMENT_ID_LEN),
     N.NAME: StrParameter(),
     N.STATE: CompoundParameter([IdsParameter(constants.STATE_ID_LEN),
                                 StrParameter()]),
@@ -1251,7 +1286,7 @@ def parse_get_params(self, qs_params):
 )
 
 PARAMS_LOCALITIES = EndpointParameters(shared_params={
-    N.ID: IdsParameter(id_length=constants.LOCALITY_ID_LEN),
+    N.ID: IdsTwoLengthParameter(*constants.LOCALITY_ID_LEN),
     N.NAME: StrParameter(),
     N.STATE: CompoundParameter([IdsParameter(constants.STATE_ID_LEN),
                                 StrParameter()]),
@@ -1323,7 +1358,7 @@ def parse_get_params(self, qs_params):
         IdsParameter(constants.CENSUS_LOCALITY_ID_LEN),
         StrParameter()
     ]),
-    N.LOCALITY: CompoundParameter([IdsParameter(constants.LOCALITY_ID_LEN),
+    N.LOCALITY: CompoundParameter([IdsTwoLengthParameter(*constants.LOCALITY_ID_LEN),
                                    StrParameter()]),
     N.ORDER: StrParameter(choices=[N.ID, N.NAME]),
     N.FLATTEN: BoolParameter(),

service/strings.py

@@ -33,7 +33,8 @@
 NOT_FOUND = 'No se encontró la URL especificada.'
 NOT_ALLOWED = 'Método no permitido en el recurso seleccionado.'
 ID_PARAM_INVALID = 'Cada ID debe ser numérico y de longitud {}.'
-ID_ALPHAMERIC_PARAM_INVALID = 'Cada ID debe ser de longitud entre {} y {}.'
+ID_TWO_LENGTH_PARAM_INVALID = 'Cada ID debe ser numérico y de longitud {} ó {}.'
+ID_ALPHAMERIC_TWO_LENGTH_PARAM_INVALID = 'Cada ID debe ser de longitud {} ó {}.'
 ID_PARAM_LENGTH = 'La cantidad de ID debe ser menor o igual que {}.'
 ID_PARAM_UNIQUE = 'La lista no debe contener ID repetidos (ID repetido: {}).'
 COMPOUND_PARAM_ERROR = 'El valor del parámetro no es válido.'