Refactoring

Author: desiena

fmdata/fmclient.py

@@ -657,8 +657,6 @@ def page_generator(
     records_retrieved = 0
 
     while is_final_page is False:
-        # TODO
-        print("itero page generator", records_retrieved, offset, page_size, limit)
         # Calculate the limit for the next request
         if limit is None:
             # If the global limit is not defined we don't know how many records we have to retrieve
@@ -675,7 +673,6 @@ def page_generator(
 
             limit_for_current_request = min(page_size, remaining)
 
-        print("chiamo request", offset, limit_for_current_request)
         client_response = fn_get_response(
             layout=layout,
             offset=offset,
@@ -687,7 +684,7 @@ def page_generator(
                                            layout=layout)
 
         result.raise_exception_if_has_error()
-        print("result", result)
+
         if any(result.get_messages_iterator(search_codes=[FMErrorEnum.NO_RECORDS_MATCH_REQUEST])):
             response_entries_count = 0
             is_final_page = True
@@ -744,8 +741,6 @@ def portal_page_generator(
     records_retrieved = 0
 
     while is_final_page is False:
-        # TODO
-        print("itero page generator", records_retrieved, offset, page_size, limit)
         # Calculate the limit for the next request
         if limit is None:
             # If the global limit is not defined we don't know how many records we have to retrieve
@@ -762,8 +757,6 @@ def portal_page_generator(
 
             limit_for_current_request = min(page_size, remaining)
 
-        print("chiamo request", offset, limit_for_current_request)
-
         portals = {
             portal_name: SinglePortalInput(offset=offset, limit=limit_for_current_request)
         }
@@ -777,8 +770,6 @@ def portal_page_generator(
 
         result.raise_exception_if_has_error()
 
-        print("result", result)
-
         response_record_count = len(result.response.data)
         if not response_record_count == 1:
             response_entries_count = 0

fmdata/orm.py

@@ -186,7 +186,6 @@ def _is_sliced(self):
         return self._slice_start != 0 or self._slice_stop is not None
 
     def _set_new_slice(self, start, stop):
-        print("set new slice", start, stop)
         # Trick to manage multiple slicing before executing the query
         if stop is not None:
             if self._slice_stop is not None:
@@ -199,8 +198,6 @@ def _set_new_slice(self, start, stop):
             else:
                 self._slice_start = self._slice_start + start
 
-        print("setted", self._slice_start, self._slice_stop)
-
     def __getitem__(self, k):
         if isinstance(k, slice):
             if (k.start is not None and k.start < 0) or (k.stop is not None and k.stop < 0):
@@ -259,9 +256,6 @@ def create(self, **kwargs):
         portal.save()
 
     def _execute_query(self):
-        # TODO
-        print("execute portal query")
-
         offset = self._slice_start + 1
         limit = None
 
@@ -809,7 +803,6 @@ def _is_sliced(self):
         return self._slice_start != 0 or self._slice_stop is not None
 
     def _set_new_slice(self, start, stop):
-        print("set new slice", start, stop)
         # Trick to manage multiple slicing before executing the query
         if stop is not None:
             if self._slice_stop is not None:
@@ -822,8 +815,6 @@ def _set_new_slice(self, start, stop):
             else:
                 self._slice_start = self._slice_start + start
 
-        print("setted", self._slice_start, self._slice_stop)
-
     def first(self):
         for obj in self[:1]:
             return obj
@@ -853,9 +844,6 @@ def _get_query(self):
         return query
 
     def _execute_query(self):
-        # TODO
-        print("execute query")
-
         offset = self._slice_start + 1
         limit = None
 
@@ -1061,7 +1049,6 @@ def __new__(mcls, name, bases, namespace):
 
         cls = super().__new__(mcls, name, bases, namespace)
 
-        # TODO probably cls.Meta is good enough
         base_schema_cls: Type[FileMakerSchema] = get_meta_attribute("base_schema", bases,
                                                                     namespace) or FileMakerSchema
         schema_cls = type(f'{name}Schema', (base_schema_cls,), schema_fields)

tests/integration/test_server.py

@@ -53,11 +53,10 @@ class Meta:
         client = fm_client
         layout = 'test_fmdata_student_layout'
 
-    # TODO required management?
-    pk = fields.Str(required=False, data_key="PrimaryKey")
-    full_name = fields.Str(required=False, data_key="FullName")
-    enrollment_date = fields.Date(required=False, data_key="EnrollmentDate")
-    GraduationYear = EmptyStringToNoneInteger(required=False, as_string=True, allow_none=True)
+    pk = fields.Str(data_key="PrimaryKey")
+    full_name = fields.Str(data_key="FullName")
+    enrollment_date = fields.Date(data_key="EnrollmentDate")
+    GraduationYear = EmptyStringToNoneInteger(as_string=True, allow_none=True)
 
     test_fmdata_class_1 = PortalField(model=ClassPortal, name="test_fmdata_class_1")
 
@@ -70,27 +69,12 @@ def test_reset_db(self):
             query=[{"PrimaryKey": "*"}]).raise_exception_if_has_error().found_set.delete_all_records()
         exam_layout.find(query=[{"PrimaryKey": "*"}]).raise_exception_if_has_error().found_set.delete_all_records()
 
-    # def test_mio(self):
-    #     # Create Students
-    #     #student = Student(record_id=53)
-    #     student = Student(full_name="Lorenzo", enrollment_date=datetime.date(2024,1,3), GraduationYear=2).save()
-    #
-    #     student.GraduationYear = 3
-    #     student.save()
-    #
-    #     student.refresh_from_db()
-    #     #student.delete()
-    #
-    #     print(student.record_id)
-    #     print(student.mod_id)
-    #     print(student.pk)
-    #     pass
     def action(self, i):
         result_set = Student.objects.order_by("pk").find(full_name__raw="*")
         for item in result_set:
             print(i, item.pk, item.full_name)
 
-    def test_mio2(self):
+    def test_0(self):
         result_set = (Student.objects.order_by("pk")
                       .find(full_name__raw="*")
                       .chunk_size(100)