Added generator in sdk and modified the calls in api

apps/sage300/models.py

@@ -1,4 +1,3 @@
-from typing import Dict, List
 from django.db import models
 
 from fyle_accounting_mappings.models import (
@@ -10,6 +9,7 @@
     StringNotNullField,
     BooleanFalseField
 )
+from sage_desktop_sdk.core.schema.read_only import Category
 
 
 class CostCategory(BaseForeignWorkspaceModel):
@@ -30,14 +30,16 @@ class Meta:
         db_table = 'cost_category'
 
     @staticmethod
-    def bulk_create_or_update(categories_generator: List[Dict], workspace_id: int):
+    def bulk_create_or_update(categories_generator, workspace_id: int):
         """
         Bulk create or update cost types
         """
 
         list_of_categories = []
         for categories in categories_generator:
-            list_of_categories.append(categories)
+            for category in categories:
+                for data in category:
+                    list_of_categories.append(Category.from_dict(data))
 
         record_number_list = [category.id for category in list_of_categories]
 

apps/sage300/utils.py

@@ -1,3 +1,4 @@
+from django.utils.module_loading import import_string
 from fyle_accounting_mappings.models import DestinationAttribute
 from apps.workspaces.models import Sage300Credential
 from sage_desktop_sdk.sage_desktop_sdk import SageDesktopSDK
@@ -66,7 +67,42 @@ def _update_latest_version(self, attribute_type: str):
 
         return []
 
-    def _sync_data(self, data, attribute_type, display_name, workspace_id, field_names):
+    def _add_to_destination_attributes(self, item, attribute_type, display_name, field_names):
+        destination_attributes = []
+
+        detail = {field: getattr(item, field) for field in field_names}
+        if item.name:
+            destination_attributes.append(self._create_destination_attribute(
+                attribute_type,
+                display_name,
+                " ".join(item.name.split()),
+                item.id,
+                item.is_active,
+                detail
+            ))
+
+        return destination_attributes
+
+    def _get_attribute_class(self, attribute_type: str):
+        """
+        Get the attribute class for the attribute type
+        :param attribute_type: Type of the attribute
+        :return: Attribute class
+        """
+        ATTRIBUTE_CLASS_MAP = {
+            'ACCOUNT': 'Account',
+            'VENDOR': 'Vendor',
+            'JOB': 'Job',
+            'STANDARD_COST_CODE': 'StandardCostCode',
+            'STANDARD_CATEGORY': 'StandardCategory',
+            'COMMITMENT': 'Commitment',
+            'COMMITMENT_ITEM': 'CommitmentItem',
+            'COST_CODE': 'CostCode'
+        }
+
+        return ATTRIBUTE_CLASS_MAP[attribute_type]
+
+    def _sync_data(self, data_gen, attribute_type, display_name, workspace_id, field_names, is_gen: bool = True):
         """
         Synchronize data from Sage Desktop SDK to your application
         :param data: Data to synchronize
@@ -77,17 +113,16 @@ def _sync_data(self, data, attribute_type, display_name, workspace_id, field_nam
         """
 
         destination_attributes = []
-        for item in data:
-            detail = {field: getattr(item, field) for field in field_names}
-            if item.name:
-                destination_attributes.append(self._create_destination_attribute(
-                    attribute_type,
-                    display_name,
-                    " ".join(item.name.split()),
-                    item.id,
-                    item.is_active,
-                    detail
-                ))
+        if is_gen:
+            for data in data_gen:
+                for items in data:
+                    for _item in items:
+                        attribute_class = self._get_attribute_class(attribute_type)
+                        item = import_string(f'sage_desktop_sdk.core.schema.read_only.{attribute_class}').from_dict(_item)
+                        destination_attributes = self._add_to_destination_attributes(item, attribute_type, display_name, field_names)
+        else:
+            for item in data_gen:
+                destination_attributes = self._add_to_destination_attributes(item, attribute_type, display_name, field_names)
 
         DestinationAttribute.bulk_create_or_update_destination_attributes(
             destination_attributes, attribute_type, workspace_id, True)
@@ -177,7 +212,7 @@ def sync_commitment_items(self):
                 'code', 'version', 'description', 'cost_code_id',
                 'category_id', 'created_on_utc', 'job_id', 'commitment_id'
             ]
-            self._sync_data(commitment_items, 'COMMITMENT_ITEM', 'commitment_item', self.workspace_id, field_names)
+            self._sync_data(commitment_items, 'COMMITMENT_ITEM', 'commitment_item', self.workspace_id, field_names, False)
 
     def sync_cost_codes(self):
         """

sage_desktop_sdk/apis/accounts.py

@@ -2,7 +2,6 @@
 Sage Desktop Categories
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import Account
 
 
 class Accounts(Client):
@@ -18,14 +17,12 @@ def get_all(self, version: int = None):
         :return: A generator yielding accounts in the Attachable Schema
         :rtype: generator of Account objects
         """
+        endpoint = Accounts.GET_ACCOUNTS + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Accounts.GET_ACCOUNTS + query_params
-        else:
-            endpoint = Accounts.GET_ACCOUNTS
+            query_params = f'&version={version}'
+            endpoint += query_params
 
         # Query the API to get all accounts
-        accounts = self._query_get_all(endpoint)
-        for account in accounts:
-            yield Account.from_dict(account)
+        accounts = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield accounts

sage_desktop_sdk/apis/categories.py

@@ -2,7 +2,6 @@
 Sage Desktop Categories
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import Category
 
 
 class Categories(Client):
@@ -20,16 +19,12 @@ def get_all_categories(self, version: int = None):
         :return: A generator yielding job categories in the Jobs Schema
         :rtype: generator of Category objects
         """
+        endpoint = Categories.GET_CATEGORIES + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Categories.GET_CATEGORIES + query_params
-        else:
-            endpoint = Categories.GET_CATEGORIES
+            query_params = f'&version={version}'
+            endpoint += query_params
 
         # Query the API to get all job categories
-        categories = self._query_get_all(endpoint)
-
-        for category in categories:
-            # Convert each category dictionary to a Category object and yield it
-            yield Category.from_dict(category)
+        categories = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield categories

sage_desktop_sdk/apis/commitments.py

@@ -3,7 +3,7 @@
 Sage Desktop Commitments
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import Commitment, CommitmentItem
+from sage_desktop_sdk.core.schema.read_only import CommitmentItem
 
 
 class Commitments(Client):
@@ -22,19 +22,15 @@ def get_all(self, version: int = None):
         :return: A generator yielding commitments in the Commitments Schema
         :rtype: generator of Commitment objects
         """
+        endpoint = Commitments.GET_COMMITMENTS + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Commitments.GET_COMMITMENTS + query_params
-        else:
-            endpoint = Commitments.GET_COMMITMENTS
+            query_params = f'&version={version}'
+            endpoint += query_params
 
         # Query the API to get all commitments
-        commitments = self._query_get_all(endpoint)
-
-        for commitment in commitments:
-            # Convert each commitment dictionary to a Commitment object and yield it
-            yield Commitment.from_dict(commitment)
+        commitments = self._query_get_all_generator(endpoint)
+        yield commitments
 
     def get_commitment_items(self, commitment_id: str, version: int = None):
         """
@@ -58,4 +54,4 @@ def get_commitment_items(self, commitment_id: str, version: int = None):
         commitment_items = self._query_get_by_id(endpoint)
 
         for commitment_item in commitment_items:
-            yield CommitmentItem.from_dict(commitment_item)
+            yield CommitmentItem.from_dict(commitment_item)

sage_desktop_sdk/apis/cost_codes.py

@@ -2,7 +2,6 @@
 Sage Desktop Cost Codes
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import CostCode
 
 
 class CostCodes(Client):
@@ -20,16 +19,12 @@ def get_all_costcodes(self, version: int = None):
         :return: A generator yielding cost codes in the Cost Code Schema
         :rtype: generator of CostCode objects
         """
+        endpoint = CostCodes.GET_COST_CODE + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = CostCodes.GET_COST_CODE + query_params
-        else:
-            endpoint = CostCodes.GET_COST_CODE
+            query_params = f'&version={version}'
+            endpoint += query_params
 
         # Query the API to get all cost codes
-        cost_codes = self._query_get_all(endpoint)
-
-        for cost_code in cost_codes:
-            # Convert each cost code dictionary to a CostCode object and yield it
-            yield CostCode.from_dict(cost_code)
+        cost_codes = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield cost_codes

sage_desktop_sdk/apis/jobs.py

@@ -2,7 +2,6 @@
 Sage Desktop Jobs
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import Job, StandardCategory, StandardCostCode
 
 
 class Jobs(Client):
@@ -22,19 +21,15 @@ def get_all_jobs(self, version: int = None):
         :return: A generator yielding jobs in the Jobs Schema
         :rtype: generator of Job objects
         """
+        endpoint = Jobs.GET_JOBS + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Jobs.GET_JOBS + query_params
-        else:
-            endpoint = Jobs.GET_JOBS
+            query_params = f'&version={version}'
+            endpoint += query_params
 
         # Query the API to get all jobs
-        jobs = self._query_get_all(endpoint)
-
-        for job in jobs:
-            # Convert each job dictionary to a Job object and yield it
-            yield Job.from_dict(job)
+        jobs = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield jobs
 
     def get_standard_costcodes(self, version: int = None):
         """
@@ -46,19 +41,15 @@ def get_standard_costcodes(self, version: int = None):
         :return: A generator yielding standard cost codes in the Cost Code Schema
         :rtype: generator of StandardCostCode objects
         """
+        endpoint = Jobs.GET_COST_CODES + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Jobs.GET_COST_CODES + query_params
-        else:
-            endpoint = Jobs.GET_COST_CODES
-
-        # Query the API to get all standard cost codes
-        costcodes = self._query_get_all(endpoint)
+            query_params = f'&version={version}'
+            endpoint += query_params
 
-        for costcode in costcodes:
-            # Convert each cost code dictionary to a StandardCostCode object and yield it
-            yield StandardCostCode.from_dict(costcode)
+        # Query the API to get all jobs
+        cost_codes = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield cost_codes
 
     def get_standard_categories(self, version: int = None):
         """
@@ -70,16 +61,12 @@ def get_standard_categories(self, version: int = None):
         :return: A generator yielding standard categories in the Categories Schema
         :rtype: generator of StandardCategory objects
         """
+        endpoint = Jobs.GET_CATEGORIES + '?page={0}'
         if version:
             # Append the version query parameter if provided
-            query_params = '?version={0}'.format(version)
-            endpoint = Jobs.GET_CATEGORIES + query_params
-        else:
-            endpoint = Jobs.GET_CATEGORIES
+            query_params = f'&version={version}'
+            endpoint += query_params
 
-        # Query the API to get all standard categories
-        categories = self._query_get_all(endpoint)
-
-        for category in categories:
-            # Convert each category dictionary to a StandardCategory object and yield it
-            yield StandardCategory.from_dict(category)
+        # Query the API to get all jobs
+        categories = self._query_get_all_generator(endpoint, is_paginated=True)
+        yield categories

sage_desktop_sdk/apis/vendors.py

@@ -2,7 +2,6 @@
 Sage Desktop Vendors
 """
 from sage_desktop_sdk.core.client import Client
-from sage_desktop_sdk.core.schema.read_only import Vendor, VendorType
 
 
 class Vendors(Client):
@@ -21,19 +20,15 @@ def get_all(self, version: int = None):
         :return: A generator yielding vendors in the Vendors Schema
         :rtype: generator of Vendor objects
         """
+        endpoint = Vendors.GET_VENDORS
         if version:
             # Append the version query parameter if provided
             query_params = '?version={0}'.format(version)
-            endpoint = Vendors.GET_VENDORS + query_params
-        else:
-            endpoint = Vendors.GET_VENDORS
+            endpoint += query_params
 
         # Query the API to get all vendors
-        vendors = self._query_get_all(endpoint)
-
-        for vendor in vendors:
-            # Convert each vendor dictionary to a Vendor object and yield it
-            yield Vendor.from_dict(vendor)
+        vendors = self._query_get_all_generator(endpoint)
+        yield vendors
 
     def get_vendor_types(self, version: int = None):
         """
@@ -45,16 +40,12 @@ def get_vendor_types(self, version: int = None):
         :return: A generator yielding vendor types in the Vendor Types Schema
         :rtype: generator of VendorType objects
         """
+        endpoint = Vendors.GET_VENDOR_TYPES
         if version:
             # Append the version query parameter if provided
             query_params = '?version={0}'.format(version)
-            endpoint = Vendors.GET_VENDOR_TYPES + query_params
-        else:
-            endpoint = Vendors.GET_VENDOR_TYPES
+            endpoint += query_params
 
         # Query the API to get all vendor types
-        vendor_types = self._query_get_all(endpoint)
-
-        for vendor_type in vendor_types:
-            # Convert each vendor type dictionary to a VendorType object and yield it
-            yield VendorType.from_dict(vendor_type)
+        vendor_types = self._query_get_all_generator(endpoint)
+        yield vendor_types