From d9510fa381ea91c351e37ed3d683173cfe88b6d5 Mon Sep 17 00:00:00 2001 From: gurusainath Date: Mon, 14 Oct 2024 13:31:07 +0530 Subject: [PATCH] migration: added external_id and external_source in issue_type --- ...e_external_id_issuetype_external_source.py | 23 +++++++++++++++++++ apiserver/plane/db/models/issue_type.py | 2 ++ apiserver/plane/utils/paginator.py | 6 +---- 3 files changed, 26 insertions(+), 5 deletions(-) create mode 100644 apiserver/plane/db/migrations/0081_issuetype_external_id_issuetype_external_source.py diff --git a/apiserver/plane/db/migrations/0081_issuetype_external_id_issuetype_external_source.py b/apiserver/plane/db/migrations/0081_issuetype_external_id_issuetype_external_source.py new file mode 100644 index 0000000000..6e02c56ea6 --- /dev/null +++ b/apiserver/plane/db/migrations/0081_issuetype_external_id_issuetype_external_source.py @@ -0,0 +1,23 @@ +# Generated by Django 4.2.16 on 2024-10-14 07:59 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('db', '0080_fileasset_draft_issue_alter_fileasset_entity_type'), + ] + + operations = [ + migrations.AddField( + model_name='issuetype', + name='external_id', + field=models.CharField(blank=True, max_length=255, null=True), + ), + migrations.AddField( + model_name='issuetype', + name='external_source', + field=models.CharField(blank=True, max_length=255, null=True), + ), + ] diff --git a/apiserver/plane/db/models/issue_type.py b/apiserver/plane/db/models/issue_type.py index f62cf54b56..cfe19434bf 100644 --- a/apiserver/plane/db/models/issue_type.py +++ b/apiserver/plane/db/models/issue_type.py @@ -19,6 +19,8 @@ class IssueType(BaseModel): is_default = models.BooleanField(default=False) is_active = models.BooleanField(default=True) level = models.PositiveIntegerField(default=0) + external_source = models.CharField(max_length=255, null=True, blank=True) + external_id = models.CharField(max_length=255, blank=True, null=True) class Meta: verbose_name = "Issue Type" diff --git a/apiserver/plane/utils/paginator.py b/apiserver/plane/utils/paginator.py index 219b646b25..58beba8e3b 100644 --- a/apiserver/plane/utils/paginator.py +++ b/apiserver/plane/utils/paginator.py @@ -150,7 +150,6 @@ class OffsetPaginator: raise BadPaginationError("Pagination offset cannot be negative") results = queryset[offset:stop] - print(limit, "limit") if cursor.value != limit: results = results[-(limit + 1) :] @@ -186,7 +185,6 @@ class OffsetPaginator: class GroupedOffsetPaginator(OffsetPaginator): - # Field mappers - list m2m fields here FIELD_MAPPER = { "labels__id": "label_ids", @@ -684,7 +682,7 @@ class SubGroupedOffsetPaginator(OffsetPaginator): # for multi groups result[ self.FIELD_MAPPER.get(self.sub_group_by_field_name) - ] = ([] if "None" in sub_group_ids else sub_group_ids) + ] = [] if "None" in sub_group_ids else sub_group_ids # If a result belongs to multiple groups, add it to each group processed_results[str(group_value)]["results"][ str(sub_group_value) @@ -761,7 +759,6 @@ class BasePaginator: ): """Paginate the request""" per_page = self.get_per_page(request, default_per_page, max_per_page) - print(per_page, "per_page") # Convert the cursor value to integer and float from string input_cursor = None try: @@ -788,7 +785,6 @@ class BasePaginator: paginator = paginator_cls(**paginator_kwargs) try: - print(per_page, "per_page 2") cursor_result = paginator.get_result( limit=per_page, cursor=input_cursor )