From 42894067b20d2f65432bbaf2ee9e86549145efc6 Mon Sep 17 00:00:00 2001 From: zawadaa Date: Tue, 3 Jul 2018 14:51:44 +0200 Subject: [PATCH 1/3] add support for time_restriction parameter --- src/main/java/pl/smsapi/api/action/sms/SMSSend.java | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java index f7d4ff4..5225f34 100644 --- a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java +++ b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java @@ -153,7 +153,16 @@ public SMSSend setParam(int i, String text) { return this; } - + + /** + * Set time restriction mode. + * Add SMS to the queue. + */ + public SMSSend setTimeRestriction(String time_restriction) { + params.put("time_restriction", time_restriction); + return this; + } + protected SendStatusResponse createResponse(String data) { JSONObject jsonObject = new JSONObject(data); return new SendStatusResponse(jsonObject.getInt("count"), jsonObject.getInt("parts"), jsonObject.optJSONArray("list")); From 71b8a9403a3ff5b8d353ef58ff1ffba01cdff937 Mon Sep 17 00:00:00 2001 From: zawadaa Date: Wed, 4 Jul 2018 10:34:28 +0200 Subject: [PATCH 2/3] parameter name fix --- src/main/java/pl/smsapi/api/action/sms/SMSSend.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java index 5225f34..b900a82 100644 --- a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java +++ b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java @@ -156,10 +156,9 @@ public SMSSend setParam(int i, String text) { /** * Set time restriction mode. - * Add SMS to the queue. */ - public SMSSend setTimeRestriction(String time_restriction) { - params.put("time_restriction", time_restriction); + public SMSSend setTimeRestriction(String timeRestriction) { + params.put("timerestriction", timeRestriction); return this; } From 28206910447bfcbe7c318d14afa437df8a562178 Mon Sep 17 00:00:00 2001 From: Maciej Lew Date: Thu, 6 Jun 2024 12:01:18 +0200 Subject: [PATCH 3/3] Adds `time_restriction` parameter for SMS send action --- CHANGELOG.md | 1 + src/main/java/pl/smsapi/api/action/sms/SMSSend.java | 2 +- src/test/java/pl/smsapi/api/action/sms/SMSSendTest.java | 4 +++- 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 2714991..c66e1ef 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -9,6 +9,7 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) a - Subusers API - `pl.smsapi.exception.SmsapiErrorException` to handle API error responses - `date_sent` to SMS/MMS send action responses +- `time_restriction` parameter for SMS send action ### Changed - `pl.smsapi.api.UserFactory.actionAdd` marked as deprecated, use `pl.smsapi.api.action.subusers.SubusersFactory.actionAdd` instead diff --git a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java index 9a42cc9..90ad9da 100644 --- a/src/main/java/pl/smsapi/api/action/sms/SMSSend.java +++ b/src/main/java/pl/smsapi/api/action/sms/SMSSend.java @@ -180,7 +180,7 @@ public SMSSend setParam(int i, String text) { * Set time restriction mode. */ public SMSSend setTimeRestriction(String timeRestriction) { - params.put("timerestriction", timeRestriction); + params.put("time_restriction", timeRestriction); return this; } diff --git a/src/test/java/pl/smsapi/api/action/sms/SMSSendTest.java b/src/test/java/pl/smsapi/api/action/sms/SMSSendTest.java index 8bf72c5..66a84e6 100644 --- a/src/test/java/pl/smsapi/api/action/sms/SMSSendTest.java +++ b/src/test/java/pl/smsapi/api/action/sms/SMSSendTest.java @@ -44,7 +44,8 @@ public void executeSendSmsWithOptionalFields() throws SmsapiException { .setNormalize(true) .setParam(1, "param") .setParam(2, new String[]{"param1", "param2"}) - .setDiscountGroup("group1"); + .setDiscountGroup("group1") + .setTimeRestriction("follow"); action.client(new ClientStub()); action.proxy(requestStub); @@ -68,6 +69,7 @@ public void executeSendSmsWithOptionalFields() throws SmsapiException { expectedRequestPayload.put("normalize", "1"); expectedRequestPayload.put("flash", "1"); expectedRequestPayload.put("from", "test"); + expectedRequestPayload.put("time_restriction", "follow"); assertEquals(expectedRequestPayload, requestStub.requestPayload); } }