Skip to content

Fix search issues included case schema #4521

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

Open
api-clients-generation-pipeline wants to merge 1 commit into
base: master
Choose a base branch
from
+18 −18
Open

Fix search issues included case schema #4521

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 .generator/schemas/v2/openapi.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54852,7 +54852,7 @@ components:
description: An array of related resources, returned when the `include` query parameter is used.
oneOf:
- $ref: "#/components/schemas/Issue"
- $ref: "#/components/schemas/Case"
- $ref: "#/components/schemas/IssueCase"
- $ref: "#/components/schemas/IssueUser"
- $ref: "#/components/schemas/IssueTeam"
IssuesSearchResultIssueRelationship:
Expand Down
34 changes: 17 additions & 17 deletions api/datadogV2/model_issues_search_result_included.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
// IssuesSearchResultIncluded - An array of related resources, returned when the `include` query parameter is used.
type IssuesSearchResultIncluded struct {
Issue *Issue
Case *Case
IssueCase *IssueCase
IssueUser *IssueUser
IssueTeam *IssueTeam

Expand All @@ -24,9 +24,9 @@ func IssueAsIssuesSearchResultIncluded(v *Issue) IssuesSearchResultIncluded {
return IssuesSearchResultIncluded{Issue: v}
}

// CaseAsIssuesSearchResultIncluded is a convenience function that returns Case wrapped in IssuesSearchResultIncluded.
func CaseAsIssuesSearchResultIncluded(v *Case) IssuesSearchResultIncluded {
return IssuesSearchResultIncluded{Case: v}
// IssueCaseAsIssuesSearchResultIncluded is a convenience function that returns IssueCase wrapped in IssuesSearchResultIncluded.
func IssueCaseAsIssuesSearchResultIncluded(v *IssueCase) IssuesSearchResultIncluded {
return IssuesSearchResultIncluded{IssueCase: v}
}

// IssueUserAsIssuesSearchResultIncluded is a convenience function that returns IssueUser wrapped in IssuesSearchResultIncluded.
Expand Down Expand Up @@ -60,21 +60,21 @@ func (obj *IssuesSearchResultIncluded) UnmarshalJSON(data []byte) error {
obj.Issue = nil
}

// try to unmarshal data into Case
err = datadog.Unmarshal(data, &obj.Case)
// try to unmarshal data into IssueCase
err = datadog.Unmarshal(data, &obj.IssueCase)
if err == nil {
if obj.Case != nil && obj.Case.UnparsedObject == nil {
jsonCase, _ := datadog.Marshal(obj.Case)
if string(jsonCase) == "{}" { // empty struct
obj.Case = nil
if obj.IssueCase != nil && obj.IssueCase.UnparsedObject == nil {
jsonIssueCase, _ := datadog.Marshal(obj.IssueCase)
if string(jsonIssueCase) == "{}" { // empty struct
obj.IssueCase = nil
} else {
match++
}
} else {
obj.Case = nil
obj.IssueCase = nil
}
} else {
obj.Case = nil
obj.IssueCase = nil
}

// try to unmarshal data into IssueUser
Expand Down Expand Up @@ -114,7 +114,7 @@ func (obj *IssuesSearchResultIncluded) UnmarshalJSON(data []byte) error {
if match != 1 { // more than 1 match
// reset to nil
obj.Issue = nil
obj.Case = nil
obj.IssueCase = nil
obj.IssueUser = nil
obj.IssueTeam = nil
return datadog.Unmarshal(data, &obj.UnparsedObject)
Expand All @@ -128,8 +128,8 @@ func (obj IssuesSearchResultIncluded) MarshalJSON() ([]byte, error) {
return datadog.Marshal(&obj.Issue)
}

if obj.Case != nil {
return datadog.Marshal(&obj.Case)
if obj.IssueCase != nil {
return datadog.Marshal(&obj.IssueCase)
}

if obj.IssueUser != nil {
Expand All @@ -152,8 +152,8 @@ func (obj *IssuesSearchResultIncluded) GetActualInstance() interface{} {
return obj.Issue
}

if obj.Case != nil {
return obj.Case
if obj.IssueCase != nil {
return obj.IssueCase
}

if obj.IssueUser != nil {
Expand Down
Loading