reverse ordering

Author: DevAlone

proxy_py/_settings.py

@@ -20,7 +20,7 @@
 BAD_PROXY_CHECKING_PERIOD = 2 * 60 * 60
 DEAD_PROXY_CHECKING_PERIOD = 24 * 60 * 60
 DEAD_PROXY_THRESHOLD = 6
-REMOVE_ON_N_BAD_CHECKS = DEAD_PROXY_THRESHOLD + 14
+REMOVE_ON_N_BAD_CHECKS = DEAD_PROXY_THRESHOLD + 21
 PROXY_CHECKING_TIMEOUT = 20
 
 PROXY_PROVIDER_SERVER_ADDRESS = {

server/requests_to_models/request_executor.py

@@ -1,3 +1,4 @@
+from proxy_py import settings
 from models import session
 from server.requests_to_models.request import Request, GetRequest, CountRequest, FetchRequest
 import importlib
@@ -20,9 +21,9 @@ def _fetch(self, request: FetchRequest):
         package = importlib.import_module(request.class_name[0])
         class_name = getattr(package, request.class_name[1])
 
-        # TODO: remove bad_proxy
+        # TODO: remove checking number_of_bad_checks
 
-        queryset = session.query(class_name).filter(class_name.number_of_bad_checks == 0)
+        queryset = session.query(class_name).filter(class_name.number_of_bad_checks < settings.DEAD_PROXY_THRESHOLD)
 
         result = {
             'count': queryset.count(),
@@ -56,7 +57,16 @@ def _fetch(self, request: FetchRequest):
     def order_by_list_to_sqlalchemy(self, order_by_fields: list, class_name):
         result = []
         for field in order_by_fields:
-            result.append(getattr(class_name, field))
+            reverse = False
+            if field[0] == '-':
+                reverse = True
+                field = field[1:]
+
+            attribute = getattr(class_name, field)
+            if reverse:
+                attribute = attribute.desc()
+
+            result.append(attribute)
 
         return result
 

server/requests_to_models/request_parser.py

@@ -47,7 +47,10 @@ def validate_value(self, key: str, value):
                 self.validate_value(key, value_item)
             return
 
-        if key in {'model', 'method', 'fields', 'order_by'}:
+        if key == 'order_by':
+            self._validate_value_type(key, value, str)
+            self._validate_value_regex(key, value, r'^-?[a-zA-Z][a-zA-Z0-9_]+$')
+        elif key in {'model', 'method', 'fields'}:
             self._validate_value_type(key, value, str)
             self._validate_value_regex(key, value, r'^[a-zA-Z][a-zA-Z0-9_]+$')
         elif key in {'filter'}:
@@ -149,8 +152,12 @@ def parse_list(self, req_dict, config, request_key, config_key, default_value):
         result = []
 
         for field in req_dict[request_key]:
-            if field not in config[config_key]:
-                raise ParseError("Field \"{}\" doesn't exist or isn't allowed".format(field))
+            if config_key == 'order_by_fields':
+                if (field[1:] if field[0] == '-' else field) not in config[config_key]:
+                    raise ParseError("Field \"{}\" doesn't exist or isn't allowed1".format(field))
+            else:
+                if field not in config[config_key]:
+                    raise ParseError("Field \"{}\" doesn't exist or isn't allowed".format(field))
 
             result.append(field)