From 1248eae63b3fb381fc78af7b18fd6688c4ac83e8 Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Fri, 29 May 2026 21:52:51 -0500 Subject: [PATCH] fix: sort farmOS data fetch when importing/exporting logs may need to add this to other things like assets and quantities? but so far logs were the only one exhibiting a problem for me.. --- src/wuttafarm/farmos/importing/model.py | 6 +++++- src/wuttafarm/importing/farmos.py | 6 +++++- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/src/wuttafarm/farmos/importing/model.py b/src/wuttafarm/farmos/importing/model.py index 011a170..6cfd2cc 100644 --- a/src/wuttafarm/farmos/importing/model.py +++ b/src/wuttafarm/farmos/importing/model.py @@ -781,7 +781,11 @@ class ToFarmOSLog(ToFarmOS): self.normal = self.app.get_normalizer(self.farmos_client) def get_target_objects(self, **kwargs): - return list(self.farmos_client.log.iterate(self.farmos_log_type)) + # nb. must sort the data or else paging / iteration will not + # work correctly and we get back data set which contains + # duplicates but also is missing some records... + params = {"sort": "drupal_internal__id"} + return list(self.farmos_client.log.iterate(self.farmos_log_type, params=params)) def get_target_object(self, key): diff --git a/src/wuttafarm/importing/farmos.py b/src/wuttafarm/importing/farmos.py index 4f5a47a..eb82fe1 100644 --- a/src/wuttafarm/importing/farmos.py +++ b/src/wuttafarm/importing/farmos.py @@ -1254,7 +1254,11 @@ class LogImporterBase(FromFarmOS, ToWutta): def get_source_objects(self): """ """ log_type = self.get_farmos_log_type() - return list(self.farmos_client.log.iterate(log_type)) + # nb. must sort the data or else paging / iteration will not + # work correctly and we get back data set which contains + # duplicates but also is missing some records... + params = {"sort": "drupal_internal__id"} + return list(self.farmos_client.log.iterate(log_type, params=params)) def normalize_source_object(self, log): """ """