Skip to content

Commit fbd099a

Browse files
committed
[feature] Allow to delete TicketForm
And use it in ITs to delete the created ones (we reached the limit of 300 forms)
1 parent d80090b commit fbd099a

File tree

2 files changed

+29
-8
lines changed

2 files changed

+29
-8
lines changed

src/main/java/org/zendesk/client/v2/Zendesk.java

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -248,6 +248,15 @@ public TicketForm createTicketForm(TicketForm ticketForm) {
248248
Collections.singletonMap("ticket_form", ticketForm))), handle(TicketForm.class, "ticket_form")));
249249
}
250250

251+
public void deleteTicketForm(TicketForm ticketForm) {
252+
checkHasId(ticketForm);
253+
deleteTicketForm(ticketForm.getId());
254+
}
255+
256+
public void deleteTicketForm(long id) {
257+
complete(submit(req("DELETE", tmpl("/ticket_forms/{id}.json").set("id", id)), handleStatus()));
258+
}
259+
251260
public Ticket importTicket(TicketImport ticketImport) {
252261
return complete(submit(req("POST", cnst("/imports/tickets.json"),
253262
JSON, json(Collections.singletonMap("ticket", ticketImport))),
@@ -2754,6 +2763,12 @@ private static void checkHasId(Ticket ticket) {
27542763
}
27552764
}
27562765

2766+
private static void checkHasId(TicketForm ticketForm) {
2767+
if (ticketForm.getId() == null) {
2768+
throw new IllegalArgumentException("TicketForm requires id");
2769+
}
2770+
}
2771+
27572772
private static void checkHasId(org.zendesk.client.v2.model.Request request) {
27582773
if (request.getId() == null) {
27592774
throw new IllegalArgumentException("Request requires id");

src/test/java/org/zendesk/client/v2/RealSmokeTest.java

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,20 +1589,26 @@ public void createOrUpdateUser() throws Exception {
15891589
public void createTicketForm() throws Exception {
15901590
createClientWithTokenOrPassword();
15911591
TicketForm form = new TicketForm();
1592+
TicketForm createdForm = null;
15921593
form.setActive(true);
15931594
final String givenName = "Test ticket form";
15941595
form.setName(givenName);
15951596
form.setDisplayName(givenName);
15961597
form.setRawName(givenName);
15971598
form.setRawDisplayName(givenName);
1598-
1599-
final TicketForm createdForm = instance.createTicketForm(form);
1600-
assertNotNull(createdForm);
1601-
assertNotNull(createdForm.getId());
1602-
assertEquals(givenName, createdForm.getName());
1603-
assertEquals(givenName, createdForm.getDisplayName());
1604-
assertEquals(givenName, createdForm.getRawName());
1605-
assertEquals(givenName, createdForm.getRawDisplayName());
1599+
try {
1600+
createdForm = instance.createTicketForm(form);
1601+
assertNotNull(createdForm);
1602+
assertNotNull(createdForm.getId());
1603+
assertEquals(givenName, createdForm.getName());
1604+
assertEquals(givenName, createdForm.getDisplayName());
1605+
assertEquals(givenName, createdForm.getRawName());
1606+
assertEquals(givenName, createdForm.getRawDisplayName());
1607+
} finally {
1608+
if (createdForm != null) {
1609+
instance.deleteTicketForm(createdForm);
1610+
}
1611+
}
16061612
}
16071613

16081614
@Test

0 commit comments

Comments
 (0)