Source freshdesk: deduplicate table names (#22164)

* #1339 source freshdesk: deduplicate table names * #1339 source freshdesk: upd changelog * #1339 source freshdeskL upd expected records * #1339 source freshdesk: upd expected records * #1339 source freshdesk - updated expected records * auto-bump connector version --------- Co-authored-by: Octavia Squidington III <octavia-squidington-iii@users.noreply.github.com>
airbytehq · Feb 6, 2023 · a6c310c · a6c310c
1 parent e6441bf
commit a6c310c
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 30 deletions.
diff --git a/airbyte-config/init/src/main/resources/seed/source_definitions.yaml b/airbyte-config/init/src/main/resources/seed/source_definitions.yaml
@@ -560,7 +560,7 @@
 - name: Freshdesk
   sourceDefinitionId: ec4b9503-13cb-48ab-a4ab-6ade4be46567
   dockerRepository: airbyte/source-freshdesk
-  dockerImageTag: 2.0.1
+  dockerImageTag: 3.0.0
   documentationUrl: https://docs.airbyte.com/integrations/sources/freshdesk
   icon: freshdesk.svg
   sourceType: api

diff --git a/airbyte-config/init/src/main/resources/seed/source_specs.yaml b/airbyte-config/init/src/main/resources/seed/source_specs.yaml
@@ -4514,7 +4514,7 @@
     supportsNormalization: false
     supportsDBT: false
     supported_destination_sync_modes: []
-- dockerImage: "airbyte/source-freshdesk:2.0.1"
+- dockerImage: "airbyte/source-freshdesk:3.0.0"
   spec:
     documentationUrl: "https://docs.airbyte.com/integrations/sources/freshdesk"
     connectionSpecification:

diff --git a/airbyte-integrations/connectors/source-freshdesk/Dockerfile b/airbyte-integrations/connectors/source-freshdesk/Dockerfile
@@ -34,5 +34,5 @@ COPY source_freshdesk ./source_freshdesk
 ENV AIRBYTE_ENTRYPOINT "python /airbyte/integration_code/main.py"
 ENTRYPOINT ["python", "/airbyte/integration_code/main.py"]
 
-LABEL io.airbyte.version=2.0.1
+LABEL io.airbyte.version=3.0.0
 LABEL io.airbyte.name=airbyte/source-freshdesk
diff --git a/airbyte-integrations/connectors/source-freshdesk/integration_tests/expected_records.jsonl b/airbyte-integrations/connectors/source-freshdesk/integration_tests/expected_records.jsonl
diff --git a/...yte-integrations/connectors/source-freshdesk/source_freshdesk/schemas/business_hours.json b/...yte-integrations/connectors/source-freshdesk/source_freshdesk/schemas/business_hours.json
@@ -17,7 +17,7 @@
     "time_zone": {
       "type": ["null", "string"]
     },
-    "business_hours": {
+    "working_hours": {
       "type": ["null", "object"],
       "properties": {
         "monday": {

diff --git a/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/streams.py b/airbyte-integrations/connectors/source-freshdesk/source_freshdesk/streams.py
@@ -99,7 +99,7 @@ def read_records(
             sync_mode=sync_mode, cursor_field=cursor_field, stream_slice=stream_slice, stream_state=stream_state
         )
 
-    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[Mapping]:
+    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[MutableMapping]:
         if self.forbidden_stream:
             return []
         return response.json() or []
@@ -156,6 +156,11 @@ class BusinessHours(FreshdeskStream):
     def path(self, **kwargs) -> str:
         return "business_hours"
 
+    def parse_response(self, response: requests.Response, **kwargs) -> Iterable[MutableMapping]:
+        for record in super().parse_response(response, **kwargs):
+            record["working_hours"] = record.pop("business_hours", None)
+            yield record
+
 
 class CannedResponseFolders(FreshdeskStream):
     def path(self, **kwargs) -> str:

diff --git a/airbyte-integrations/connectors/source-freshdesk/tickets.sqlite b/airbyte-integrations/connectors/source-freshdesk/tickets.sqlite
diff --git a/docs/integrations/sources/freshdesk.md b/docs/integrations/sources/freshdesk.md
@@ -67,7 +67,8 @@ The Freshdesk connector should not run into Freshdesk API limitations under norm
 
 | Version | Date       | Pull Request                                             | Subject                                                                               |
 |:--------|:-----------|:---------------------------------------------------------|:--------------------------------------------------------------------------------------|
-| 2.0.1   | 2023-01-27 | [21888](https://github.com/airbytehq/airbyte/pull/21888) | Set `AvailabilityStrategy` for streams explicitly to `None`                                                     |
+| 3.0.0   | 2023-01-31 | [22164](https://github.com/airbytehq/airbyte/pull/22164) | Rename nested `business_hours` table to `working_hours`                               |
+| 2.0.1   | 2023-01-27 | [21888](https://github.com/airbytehq/airbyte/pull/21888) | Set `AvailabilityStrategy` for streams explicitly to `None`                           |
 | 2.0.0   | 2022-12-20 | [20416](https://github.com/airbytehq/airbyte/pull/20416) | Fix `SlaPolicies` stream schema                                                       |
 | 1.0.0   | 2022-11-16 | [19496](https://github.com/airbytehq/airbyte/pull/19496) | Fix `Contacts` stream schema                                                          |
 | 0.3.8   | 2022-11-11 | [19349](https://github.com/airbytehq/airbyte/pull/19349) | Do not rely on response.json() when deciding to retry a request                       |