From 3a980bd1ac7e94471d043ecf346259ac2a51c7d8 Mon Sep 17 00:00:00 2001
From: oleh <lovemybeard@gmail.com>
Date: Thu, 23 Dec 2021 11:25:14 +0200
Subject: [PATCH] 9017 Fix fetching and update schema for `filters` stream

---
 airbyte-integrations/connectors/source-jira/Dockerfile      | 2 +-
 .../connectors/source-jira/source_jira/schemas/filters.json | 6 ++++++
 .../connectors/source-jira/source_jira/streams.py           | 5 +++++
 docs/integrations/sources/jira.md                           | 1 +
 4 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/airbyte-integrations/connectors/source-jira/Dockerfile b/airbyte-integrations/connectors/source-jira/Dockerfile
index 0e75eebc3d0f..ed82b96a277c 100644
--- a/airbyte-integrations/connectors/source-jira/Dockerfile
+++ b/airbyte-integrations/connectors/source-jira/Dockerfile
@@ -12,5 +12,5 @@ RUN pip install .
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=0.2.15
+LABEL io.airbyte.version=0.2.16
 LABEL io.airbyte.name=airbyte/source-jira
diff --git a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json
index 2ffce733c597..31c9d2e29ff1 100644
--- a/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json
+++ b/airbyte-integrations/connectors/source-jira/source_jira/schemas/filters.json
@@ -2,6 +2,9 @@
   "$schema": "http://json-schema.org/draft-07/schema#",
   "type": "object",
   "properties": {
+    "expand": {
+      "type": "string"
+    },
     "self": {
       "type": "string",
       "description": "The URL of the filter.",
@@ -2590,6 +2593,9 @@
         }
       }
     },
+    "isWritable": {
+      "type": "boolean"
+    },
     "subscriptions": {
       "type": "array",
       "description": "The users that are subscribed to the filter.",
diff --git a/airbyte-integrations/connectors/source-jira/source_jira/streams.py b/airbyte-integrations/connectors/source-jira/source_jira/streams.py
index c11b12a02fbf..eb33f5c79731 100644
--- a/airbyte-integrations/connectors/source-jira/source_jira/streams.py
+++ b/airbyte-integrations/connectors/source-jira/source_jira/streams.py
@@ -286,6 +286,11 @@ class Filters(JiraStream):
     def path(self, **kwargs) -> str:
         return "filter/search"
 
+    def request_params(self, **kwargs) -> MutableMapping[str, Any]:
+        params = super().request_params(**kwargs)
+        params["expand"] = "description,owner,jql,viewUrl,searchUrl,favourite,favouritedCount,sharePermissions,isWritable,subscriptions"
+        return params
+
 
 class FilterSharing(JiraStream):
     """
diff --git a/docs/integrations/sources/jira.md b/docs/integrations/sources/jira.md
index bdae1ce8fa9c..c2cd0319a3a2 100644
--- a/docs/integrations/sources/jira.md
+++ b/docs/integrations/sources/jira.md
@@ -85,6 +85,7 @@ The Jira connector should not run into Jira API limitations under normal usage.
 
 | Version | Date | Pull Request | Subject |
 | :--- | :--- | :--- | :--- |
+| 0.2.16 | 2021-12-23 | [\#9079](https://github.com/airbytehq/airbyte/pull/9079) | Update schema for `filters` stream + fix fetching `filters` stream |
 | 0.2.15 | 2021-11-01 | [\#7398](https://github.com/airbytehq/airbyte/pull/7398) | Add option to render fields in HTML format and fix sprint_issue ids |
 | 0.2.14 | 2021-10-27 | [\#7408](https://github.com/airbytehq/airbyte/pull/7408) | Fix normalization step error. Fix schemas. Fix `acceptance-test-config.yml`. Fix `streams.py`. |
 | 0.2.13 | 2021-10-20 | [\#7222](https://github.com/airbytehq/airbyte/pull/7222) | Source Jira: Make recently added configs optional for backwards compatibility |