Skip to content

Commit ef55117

Browse files
stephenfinstephenfin
committed
openapi: Fix issues with events API
The previous_delegate and current_delegate fields are nullable. Signed-off-by: Stephen Finucane <stephen@that.guru>
1 parent 84ebc71 commit ef55117

File tree

7 files changed

+85
-17
lines changed

7 files changed

+85
-17
lines changed

‎docs/api/schemas/latest/patchwork.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,9 +2000,21 @@ components:
20002000
patch:
20012001
$ref: '#/components/schemas/PatchEmbedded'
20022002
previous_delegate:
2003-
$ref: '#/components/schemas/UserEmbedded'
2003+
title: Previous delegate
2004+
type:
2005+
- 'null'
2006+
- 'object'
2007+
oneOf:
2008+
- type: 'null'
2009+
- $ref: '#/components/schemas/UserEmbedded'
20042010
current_delegate:
2005-
$ref: '#/components/schemas/UserEmbedded'
2011+
title: Current delegate
2012+
type:
2013+
- 'null'
2014+
- 'object'
2015+
oneOf:
2016+
- type: 'null'
2017+
- $ref: '#/components/schemas/UserEmbedded'
20062018
EventCheckCreated:
20072019
title: Check create event
20082020
description: |

‎docs/api/schemas/patchwork.j2‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2078,9 +2078,21 @@ components:
20782078
patch:
20792079
$ref: '#/components/schemas/PatchEmbedded'
20802080
previous_delegate:
2081-
$ref: '#/components/schemas/UserEmbedded'
2081+
title: Previous delegate
2082+
type:
2083+
- 'null'
2084+
- 'object'
2085+
oneOf:
2086+
- type: 'null'
2087+
- $ref: '#/components/schemas/UserEmbedded'
20822088
current_delegate:
2083-
$ref: '#/components/schemas/UserEmbedded'
2089+
title: Current delegate
2090+
type:
2091+
- 'null'
2092+
- 'object'
2093+
oneOf:
2094+
- type: 'null'
2095+
- $ref: '#/components/schemas/UserEmbedded'
20842096
EventCheckCreated:
20852097
title: Check create event
20862098
description: |

‎docs/api/schemas/v1.0/patchwork.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1608,9 +1608,21 @@ components:
16081608
patch:
16091609
$ref: '#/components/schemas/PatchEmbedded'
16101610
previous_delegate:
1611-
$ref: '#/components/schemas/UserEmbedded'
1611+
title: Previous delegate
1612+
type:
1613+
- 'null'
1614+
- 'object'
1615+
oneOf:
1616+
- type: 'null'
1617+
- $ref: '#/components/schemas/UserEmbedded'
16121618
current_delegate:
1613-
$ref: '#/components/schemas/UserEmbedded'
1619+
title: Current delegate
1620+
type:
1621+
- 'null'
1622+
- 'object'
1623+
oneOf:
1624+
- type: 'null'
1625+
- $ref: '#/components/schemas/UserEmbedded'
16141626
EventCheckCreated:
16151627
title: Check create event
16161628
description: |

‎docs/api/schemas/v1.1/patchwork.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1635,9 +1635,21 @@ components:
16351635
patch:
16361636
$ref: '#/components/schemas/PatchEmbedded'
16371637
previous_delegate:
1638-
$ref: '#/components/schemas/UserEmbedded'
1638+
title: Previous delegate
1639+
type:
1640+
- 'null'
1641+
- 'object'
1642+
oneOf:
1643+
- type: 'null'
1644+
- $ref: '#/components/schemas/UserEmbedded'
16391645
current_delegate:
1640-
$ref: '#/components/schemas/UserEmbedded'
1646+
title: Current delegate
1647+
type:
1648+
- 'null'
1649+
- 'object'
1650+
oneOf:
1651+
- type: 'null'
1652+
- $ref: '#/components/schemas/UserEmbedded'
16411653
EventCheckCreated:
16421654
title: Check create event
16431655
description: |

‎docs/api/schemas/v1.2/patchwork.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1837,9 +1837,21 @@ components:
18371837
patch:
18381838
$ref: '#/components/schemas/PatchEmbedded'
18391839
previous_delegate:
1840-
$ref: '#/components/schemas/UserEmbedded'
1840+
title: Previous delegate
1841+
type:
1842+
- 'null'
1843+
- 'object'
1844+
oneOf:
1845+
- type: 'null'
1846+
- $ref: '#/components/schemas/UserEmbedded'
18411847
current_delegate:
1842-
$ref: '#/components/schemas/UserEmbedded'
1848+
title: Current delegate
1849+
type:
1850+
- 'null'
1851+
- 'object'
1852+
oneOf:
1853+
- type: 'null'
1854+
- $ref: '#/components/schemas/UserEmbedded'
18431855
EventCheckCreated:
18441856
title: Check create event
18451857
description: |

‎docs/api/schemas/v1.3/patchwork.yaml‎

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2000,9 +2000,21 @@ components:
20002000
patch:
20012001
$ref: '#/components/schemas/PatchEmbedded'
20022002
previous_delegate:
2003-
$ref: '#/components/schemas/UserEmbedded'
2003+
title: Previous delegate
2004+
type:
2005+
- 'null'
2006+
- 'object'
2007+
oneOf:
2008+
- type: 'null'
2009+
- $ref: '#/components/schemas/UserEmbedded'
20042010
current_delegate:
2005-
$ref: '#/components/schemas/UserEmbedded'
2011+
title: Current delegate
2012+
type:
2013+
- 'null'
2014+
- 'object'
2015+
oneOf:
2016+
- type: 'null'
2017+
- $ref: '#/components/schemas/UserEmbedded'
20062018
EventCheckCreated:
20072019
title: Check create event
20082020
description: |

‎patchwork/tests/api/test_event.py‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@
66
from django.test import override_settings
77
from django.urls import reverse
88
from rest_framework import status
9-
from rest_framework.test import APITestCase
10-
119

1210
from patchwork.models import Event
1311
from patchwork.tests.api import utils
@@ -21,10 +19,8 @@
2119
from patchwork.tests.utils import create_state
2220

2321

24-
# FIXME(stephenfin: This should inherit from 'utils.APITestCase', but we need
25-
# to fix our schema to work with recent versions of openapi_core
2622
@override_settings(ENABLE_REST_API=True)
27-
class TestEventAPI(APITestCase):
23+
class TestEventAPI(utils.APITestCase):
2824
@staticmethod
2925
def api_url(version=None):
3026
kwargs = {}

0 commit comments

Comments
 (0)