Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Source freshdesk: deduplicate table names #22164

Merged
merged 7 commits into from
Feb 6, 2023
Merged

Source freshdesk: deduplicate table names #22164

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
ed91e32
#1339 source freshdesk: deduplicate table names
davydov-d Jan 31, 2023
e83a745
#1339 source freshdesk: upd changelog
davydov-d Jan 31, 2023
bbddf8b
#1339 source freshdeskL upd expected records
davydov-d Jan 31, 2023
0a72e1a
#1339 source freshdesk: upd expected records
davydov-d Feb 1, 2023
7bc9a43
#1339 source freshdesk - updated expected records
davydov-d Feb 1, 2023
6b04906
auto-bump connector version
octavia-squidington-iii Feb 6, 2023
f4ac303
Merge branch 'master' into ddavydov/#1339-source-freshdesk-fix-nested…
davydov-d Feb 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_definitions.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion airbyte-config/init/src/main/resources/seed/source_specs.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion airbyte-integrations/connectors/source-freshdesk/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
30 changes: 6 additions & 24 deletions airbyte-integrations/connectors/source-freshdesk/integration_tests/expected_records.jsonl
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion ...yte-integrations/connectors/source-freshdesk/source_freshdesk/schemas/business_hours.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
"time_zone": {
"type": ["null", "string"]
},
"business_hours": {
"working_hours": {
"type": ["null", "object"],
"properties": {
"monday": {
Expand Down
7 changes: 6 additions & 1 deletion airbyte-integrations/connectors/source-freshdesk/source_freshdesk/streams.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 []
Expand Down Expand Up @@ -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:
Expand Down
Binary file removed airbyte-integrations/connectors/source-freshdesk/tickets.sqlite
View file
Open in desktop
Binary file not shown.
3 changes: 2 additions & 1 deletion docs/integrations/sources/freshdesk.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand Down