Subversion Repositories SmartDukaan

Rev

Rev 32508 | Rev 32850 | Go to most recent revision | Show entire file | Ignore whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 32508 Rev 32777
Line 232... Line 232...
232 
        requestParams.put("password", "MFRd!BBL");
 232 
        requestParams.put("password", "MFRd!BBL");
233 
        requestParams.put("send_to", sendTo);
 233 
        requestParams.put("send_to", sendTo);
234 
        requestParams.put("v", "1.1");
 234 
        requestParams.put("v", "1.1");
235 
        requestParams.put("format", "json");
 235 
        requestParams.put("format", "json");
236 
        requestParams.put("auth_scheme", "plain");
 236 
        requestParams.put("auth_scheme", "plain");
- 
 
 237 
        Optin optin = optinRepository.selectByMobile(mobile);
- 
 
 238 
        if (optin == null) {
- 
 
 239 
            this.optIn(sendTo);
- 
 
 240 
            optin = new Optin();
- 
 
 241 
            optin.setCreated(LocalDateTime.now());
- 
 
 242 
            optin.setMobile(mobile);
- 
 
 243 
            optinRepository.persist(optin);
- 
 
 244 
        }
237 
        if (mediaUrl == null) {
 245 
        if (mediaUrl == null) {
238 
            requestParams.put("method", "SENDMESSAGE");
 246 
            requestParams.put("method", "SENDMESSAGE");
239 
            /*requestParams.put("msg_type", "HSM");
 247 
            requestParams.put("msg_type", "TEXT");
240 
            requestParams.put("msg", message);
 248 
            requestParams.put("msg", message);
241 
            requestParams.put("isTemplate", "true");
 249 
            requestParams.put("isTemplate", "true");
242 
            requestParams.put("header", title);*/
 250 
            requestParams.put("header", title);
243 
            //} else if(isProd && mediaUrl !=null) {
 - 
 
244 
        } else if (mediaUrl != null) {
 251 
        } else if (mediaUrl != null) {
245 
            //requestParams.put("isHSM", "true");
 - 
 
246 
 
 - 
 
247 
            Optin optin = optinRepository.selectByMobile(mobile);
 - 
 
248 
            if (optin == null) {
 - 
 
249 
                this.optIn(sendTo);
 - 
 
250 
                optin = new Optin();
 - 
 
251 
                optin.setCreated(LocalDateTime.now());
 - 
 
252 
                optin.setMobile(mobile);
 - 
 
253 
                optinRepository.persist(optin);
 - 
 
254 
            }
 - 
 
255 
 
 - 
 
256 
            requestParams.put("method", "SENDMEDIAMESSAGE");
 252 
            requestParams.put("method", "SENDMEDIAMESSAGE");
257 
            requestParams.put("msg_type", "DOCUMENT");
 253 
            requestParams.put("msg_type", "DOCUMENT");
258 
            requestParams.put("caption", message);
 254 
            requestParams.put("caption", message);
259 
            //requestParams.put("msg", message);
 255 
            //requestParams.put("msg", message);
260 
            requestParams.put("media_url", mediaUrl);
 256 
            requestParams.put("media_url", mediaUrl);
261 
            requestParams.put("filename", fileName);
 257 
            requestParams.put("filename", fileName);
262 
            String response =
 - 
 
263 
                    restClient.post("https://media.smsgupshup.com/GatewayAPI/rest",
 - 
 
264 
                            requestParams,
 - 
 
265 
                            requestheaders);
 - 
 
266 
            LOGGER.info("response" + response);
 - 
 
267 
 
 - 
 
268 
            JSONObject jsonObject = new JSONObject(response);
 - 
 
269 
 
 - 
 
270 
            JSONObject whatsappResponse = (JSONObject) jsonObject.get("response");
 - 
 
271 
 
 - 
 
272 
            String externalId = whatsappResponse.getString("id");
 - 
 
273 
            String phone = whatsappResponse.getString("phone");
 - 
 
274 
 
 - 
 
275 
            WhatsappMessage whatsappMessage = new WhatsappMessage();
 - 
 
276 
            whatsappMessage.setCreatedTimestamp(LocalDateTime.now());
 - 
 
277 
            whatsappMessage.setExternalId(externalId);
 - 
 
278 
            whatsappMessage.setDestAddr(phone);
 - 
 
279 
            whatsappMessageRepository.persist(whatsappMessage);
 - 
 
280 
        }
 258 
        }
- 
 
 259 
        String response =
- 
 
 260 
                restClient.post("https://media.smsgupshup.com/GatewayAPI/rest",
- 
 
 261 
                        requestParams,
- 
 
 262 
                        requestheaders);
- 
 
 263 
        LOGGER.info("response  - {}", response);
- 
 
 264 
 
- 
 
 265 
        JSONObject jsonObject = new JSONObject(response);
281 
 
 266 
 
- 
 
 267 
        JSONObject whatsappResponse = (JSONObject) jsonObject.get("response");
- 
 
 268 
 
- 
 
 269 
        String externalId = whatsappResponse.getString("id");
- 
 
 270 
        String phone = whatsappResponse.getString("phone");
- 
 
 271 
 
- 
 
 272 
        WhatsappMessage whatsappMessage = new WhatsappMessage();
- 
 
 273 
        whatsappMessage.setCreatedTimestamp(LocalDateTime.now());
- 
 
 274 
        whatsappMessage.setExternalId(externalId);
- 
 
 275 
        whatsappMessage.setDestAddr(phone);
- 
 
 276 
        whatsappMessageRepository.persist(whatsappMessage);
282 
    }
 277 
    }
283 
 
 278 
 
284 
    @Override
 279 
    @Override
285 
    public boolean isWhatMessageSend(String mobile) {
 280 
    public boolean isWhatMessageSend(String mobile) {
286 
        String destAddr = "91" + mobile;
 281 
        String destAddr = "91" + mobile;