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.

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

Feature ussd sms #78

Open
wants to merge 127 commits into
base: master
Choose a base branch
from
Open
Changes from 2 commits
Commits
Show all changes
127 commits
Select commit Hold shift + click to select a range
4680c3d
Change client correlator mandatory
Feb 6, 2017
2f25b40
Paymrnt DAO layer
Feb 7, 2017
18cb90c
make payment validations
Feb 7, 2017
9b930c9
WIP charge user
Feb 7, 2017
44022db
Implemented charge request classes
Feb 7, 2017
29281a6
Implemented charge Response Clases
Feb 7, 2017
44c2854
gitignote updated
Feb 8, 2017
a37d321
gitignore updated
Feb 8, 2017
d2cee73
deleted log files
Feb 8, 2017
a82118e
WIP refund payment Api
Feb 8, 2017
959b2d6
Implemented Payment Refund version-1
Feb 9, 2017
3514dfc
Rewrite partial credit API
Feb 8, 2017
4742dc5
Implement filter for payment API
Feb 9, 2017
087e0f5
Recorrect Code
Feb 13, 2017
3623287
alter some classes
Feb 13, 2017
23c4c24
solve HUBDEV-790
Feb 14, 2017
8a22e49
[maven-release-plugin] prepare release v1_6_0-RC1
Feb 14, 2017
600892b
[maven-release-plugin] prepare for next development iteration
Feb 14, 2017
fffa6bf
Location Service implementation
Feb 15, 2017
5c04cda
Change client correlator mandatory
Feb 6, 2017
de15b94
Paymrnt DAO layer
Feb 7, 2017
f1d26e0
make payment validations
Feb 7, 2017
6ac36a2
WIP charge user
Feb 7, 2017
7eb0fd3
Implemented charge request classes
Feb 7, 2017
9e52732
Implemented charge Response Clases
Feb 7, 2017
796e7eb
gitignote updated
Feb 8, 2017
a42215e
gitignore updated
Feb 8, 2017
95f181f
deleted log files
Feb 8, 2017
6f37cab
WIP refund payment Api
Feb 8, 2017
dad2ea6
Implemented Payment Refund version-1
Feb 9, 2017
94fd419
Rewrite partial credit API
Feb 8, 2017
a8915fc
Implement filter for payment API
Feb 9, 2017
f17978a
Recorrect Code
Feb 13, 2017
2121bf0
alter some classes
Feb 13, 2017
9d0d347
solve HUBDEV-790
Feb 14, 2017
fcefd7f
[maven-release-plugin] prepare release v1_6_0-RC1
Feb 14, 2017
cbb539b
[maven-release-plugin] prepare for next development iteration
Feb 14, 2017
1cece73
Location Service implementation
Feb 15, 2017
9567e49
Implement abstract level message logger
Feb 23, 2017
7868ddc
Implemented payment List charged operations v1
Feb 15, 2017
fe99bba
WIP refactoring payment api
Feb 23, 2017
28c3d4e
added resource URL to payment api response
Feb 24, 2017
98715d4
made transactionOperationStatus attribute mandatory in refund api
Feb 24, 2017
318effc
refactor PaymentRequestHandler v2
Feb 24, 2017
07b7589
merged with upstream
Feb 24, 2017
3182420
WIP refund check with originalServerReferenceCode
Feb 27, 2017
3e59157
HUBDEV-1444 Charge and Refund calls validation
Feb 27, 2017
5cc3fa7
Modify PatialRefund API
Feb 28, 2017
40040d4
check partial Refund payments
Feb 28, 2017
b4c58a2
HUBDEV-1456, HUBDEV-1457, HUBDEV-1449, HUBDEV-1444, HUBDEV-1440 Fixed
Feb 28, 2017
aca77fd
WIP setting mandotory feilds
Feb 28, 2017
c762f51
Merge branch 'feature_lcation_payment' of https://github.com/SidathWe…
Feb 28, 2017
8ac4401
Implimented List charge operations v2
Mar 1, 2017
c348c7e
added optional feilds to refundbean
Mar 1, 2017
c95eb58
HUBDEV-1453 fixed
Mar 1, 2017
36a54ab
Merge branch 'feature_lcation_payment' of https://github.com/SidathWe…
Mar 1, 2017
3447948
removed unused methods
Mar 1, 2017
f3a4867
added Refund for List Charge Operations
Mar 1, 2017
8826c33
added status,type enums
Mar 2, 2017
a07d360
updated Readme.md
Mar 2, 2017
8948dd9
changes to db script
Mar 2, 2017
27657e1
Merge pull request #57 from Rajithkonara/feature_lcation_payment
Mar 2, 2017
b8c9e89
Add compatible versions
Mar 3, 2017
faa0ac8
Update version numbers
Mar 3, 2017
e46943d
Merge pull request #58 from SidathWeerasinghe/feature_lcation_payment
Mar 6, 2017
ea8df25
[maven-release-plugin] prepare release v1_6_1
Mar 6, 2017
55c0d2f
[maven-release-plugin] prepare for next development iteration
Mar 6, 2017
5ccfd1a
Implement Send SMS API for Gateway and Hub
Mar 9, 2017
b69dbc9
Merge pull request #59 from SidathWeerasinghe/feature_ussd_sms
Mar 9, 2017
ed4c536
Update Send SMS API logic
Mar 13, 2017
d93234a
Implement Receiving SMS API
Mar 14, 2017
a0f7629
Merge pull request #61 from SidathWeerasinghe/feature_ussd_sms
Mar 14, 2017
cdb72c5
Implement Subscribe to notifications of messages sent to your applica…
Mar 15, 2017
457659c
Merge pull request #62 from SidathWeerasinghe/feature_ussd_sms
shawijayasekera Mar 15, 2017
b4f10ac
Implement Stop the subscription to message notifications
Mar 15, 2017
ab0de42
Merge pull request #64 from SidathWeerasinghe/feature_ussd_sms
Mar 16, 2017
e10b2fe
set up basic classes for ussd
Mar 7, 2017
10550a7
table for ussd shortcode and keyword
Mar 7, 2017
cdc8fcc
check for dublicate clientCorrelatores
Mar 7, 2017
ed4c6fd
WIP ussd init mobile terminated
Mar 9, 2017
bcaa40d
changed status codes
Mar 9, 2017
9ee7788
stop subscription to delivery SMS
Mar 15, 2017
60b5e20
resolve merge conflicts
Mar 16, 2017
e422ec2
endpont filter
Mar 16, 2017
111a532
resolve merge conflicts
Mar 16, 2017
3016df6
added error loggings
Mar 16, 2017
1329b0c
Merge pull request #66 from Rajithkonara/feature_ussd_sms
Mar 16, 2017
0fb83a5
Query SMS Delivery Status
Mar 15, 2017
18ea50e
Updates of Query SMS Delivery Status
Mar 15, 2017
a9226bd
Edits of Query SMS Delivery Status API
Mar 15, 2017
6ee456f
Fixation of Query Sms Delivery Status
Mar 16, 2017
122c7d9
Updated Query SMS Delivery Status API according to the PR comments
Mar 16, 2017
43ed00d
Merge pull request #67 from HPBmla/feature_ussd_sms
Mar 17, 2017
aaee3c2
mi-util version upgraded
Mar 17, 2017
0a5437a
Bug fixation of Credit API
Mar 17, 2017
c4955f3
Fixation of passing null values to Request in Credit API Bug
Mar 17, 2017
0348e6c
Merge pull request #68 from HPBmla/feature_ussd_sms
Mar 17, 2017
831bcaa
remove unwanted dbscript
Mar 24, 2017
ce27f9c
Update Readme.md
Mar 16, 2017
8043127
Update DB Script and Implement Config Service for USSD
Mar 17, 2017
c2a58dd
Implement config service for SMS
Mar 17, 2017
83f3031
Rewrite Wallet MakePayment API
Mar 22, 2017
20ee9dd
Rewrite wallet refund API
Mar 23, 2017
2c1c4dc
Update classes
Mar 23, 2017
832153f
Rewrite wallet ListTransaction API
Mar 23, 2017
7576cae
Fixed HUBDEV-1386 amount validation for SMS Type
Mar 23, 2017
6d61a33
Refactoring msisdn related classes
Mar 24, 2017
60e07c6
Edit Location API URL
Mar 24, 2017
c065363
Fixed HUBDEV-1518
Mar 24, 2017
031467d
Fixed HUBDEV-1495
Mar 24, 2017
af7bb9f
Merge pull request #70 from SidathWeerasinghe/feature_ussd_sms
Mar 24, 2017
35f1568
Fixed HUBDEV-1515
Mar 27, 2017
283804e
Fixed HUBDEV-1521
Mar 27, 2017
a2bfb0d
Merge pull request #71 from SidathWeerasinghe/feature_ussd_sms
Mar 27, 2017
2883bf7
Refectoring SMS API
Mar 28, 2017
950b043
Exception Handeling
Mar 29, 2017
b174351
Bug fixation of Ticket HUBDEV-1489
Mar 23, 2017
adfcacd
Bug fixation of HUBDEV-1492 and HUBDEV-1516
Mar 27, 2017
46443d7
Refactoring of Query SMS Delivery Status for transactionId
Mar 28, 2017
192021f
code optimization and further fixes related to CustomerInfo API
Mar 29, 2017
208c3ae
refactoring Provisioning API to make requestIdentifier unique per req…
Mar 29, 2017
a2c8a3a
[maven-release-plugin] prepare release v1_7_0
Mar 29, 2017
44ada5b
[maven-release-plugin] prepare for next development iteration
Mar 29, 2017
db4347f
Fixed DEPSB-88, DEPSB-29, DEPSB-87
SidathWeerasinghe May 15, 2017
68f17ee
Merge pull request #76 from SidathWeerasinghe/feature_ussd_sms
Buddhima May 15, 2017
0044604
[maven-release-plugin] prepare release v1_7_1
May 15, 2017
323c76e
[maven-release-plugin] prepare for next development iteration
May 15, 2017
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 dep-sandbox/dbscripts/dep-sandbox1_7_0.sql
Original file line number Diff line number Diff line change
@@ -49,7 +49,7 @@ CREATE TABLE IF NOT EXISTS `sbxapiservicecalls` (
-- Dumping data for table `sbxapiservicecalls`
--

INSERT INTO `sbxapiservicecalls` VALUES (1,8,'GetAttribute'),(2,8,'GetProfile'),(3,7,'GetApplicable'),(4,6,'MakePayment'),(5,6,'ListPayment'),(6,6,'RefundPayment'),(7,6,'BalanceLookup'),(8,5,'ApplyCredit'),(9,5,'PartialRefund'),(10,4,'ChargeUser'),(11,4,'RefundUser'),(12,4,'ListPayment'),(13,1,'Location'),(14,3,'InitUSSD'),(15,2,'SendSMS'),(16,2,'ReceivingSMS'),(17,2,'QuerySMSStatus'),(18,2,'SubscribeToSMSDelivery'),(19,2,'SubscribeToApplication'),(20,2,'StopSubscriptionDelivery'),(21,2,'StopSubscribeToApplication');
INSERT INTO `sbxapiservicecalls` VALUES (1,8,'GetAttribute'),(2,8,'GetProfile'),(3,7,'GetApplicable'),(4,6,'MakePayment'),(5,6,'ListPayment'),(6,6,'RefundPayment'),(7,6,'BalanceLookup'),(8,5,'ApplyCredit'),(9,5,'PartialRefund'),(10,4,'ChargeUser'),(11,4,'RefundUser'),(12,4,'ListPayment'),(13,1,'Location'),(14,3,'InitUSSD'),(15,2,'SendSMS'),(16,2,'ReceivingSMS'),(17,2,'QuerySMSStatus'),(18,2,'SubscribeToSMSDelivery'),(19,2,'SubscribeToApplication'),(20,2,'StopSubscriptionDelivery'),(21,2,'StopSubscribeToApplication'),(22,7,'ListService'),(23,7,'QueryService');



1 change: 1 addition & 0 deletions dep-sandbox/dbscripts/migration1_7_0to1_7_1.sql
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
INSERT INTO `sbxapiservicecalls` VALUES (22,7,'ListService'),(23,7,'QueryService');
Original file line number Diff line number Diff line change
@@ -44,7 +44,7 @@ public class USSDService {
Log LOG = LogFactory.getLog(USSDService.class);

@POST
@Path("/ussd/v1/outbound/{endUserId}")
@Path("/outbound/{endUserId}")
@ApiOperation(value = "ussdSession", notes = "initiate ussd session with endUser", response = Response.class)
@ApiImplicitParams({
@ApiImplicitParam(name = "sandbox", value = "Authorization token", required = true, dataType = "string", paramType = "header")})
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package com.wso2telco.services.dep.sandbox.servicefactory.credit;

import com.wso2telco.services.dep.sandbox.dao.model.custom.ErrorResponseDTO;
import com.wso2telco.services.dep.sandbox.dao.model.custom.RefundResponseBean;
import com.wso2telco.services.dep.sandbox.servicefactory.AbstractReturnWrapperDTO;

@@ -9,11 +10,13 @@ public class PatialRefundResponseWrapper extends AbstractReturnWrapperDTO {

@Override
public Object getResponse() {
if (getRequestError() != null) {
return getRequestError();
}

return refundResponseBean;
if (getRequestError() == null) {
return refundResponseBean;
} else {
ErrorResponseDTO response = new ErrorResponseDTO(getRequestError());
return response;
}
}

public RefundResponseBean getRefundResponseBean() {
Original file line number Diff line number Diff line change
@@ -304,7 +304,7 @@ protected Returnable process(
clientReferenceCode, notifyURL, callbackData, statusMap);
// create json body from updated service object
buildJsonResponseBody(deletedServiceList);
responseWrapper.setHttpStatus(Response.Status.OK);
responseWrapper.setHttpStatus(Response.Status.CREATED);
return responseWrapper;
} else {
// check for already removed provisioned service for request