Payment urls fixed, plan ids adding to database

Author: TobyNartowski

src/main/java/pl/simplemethod/codebin/paypal/PayPalBillingPlan.java

@@ -21,8 +21,8 @@ public PayPalBillingPlan(APIContext apiContext) {
         this.apiContext = apiContext;
     }
 
-    private static final String CANCEL_URL = "http://127.0.0.1/dashboard/dashboard-payment-error.html";
-    private static final String PROCESS_URL = "http://127.0.0.1/dashboard/dashboard-payment-accept.html";
+    private static final String CANCEL_URL = "http://127.0.0.1/dashboard.html#!/payment-error";
+    private static final String PROCESS_URL = "http://127.0.0.1/paypal/payment-success";
 
     /**
      * Creates a plan to billing plan

src/main/java/pl/simplemethod/codebin/paypal/PayPalController.java

@@ -3,65 +3,77 @@
 import com.paypal.api.payments.Agreement;
 import com.paypal.api.payments.Plan;
 import com.paypal.base.rest.PayPalRESTException;
-import org.json.JSONObject;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpHeaders;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.*;
+import pl.simplemethod.codebin.model.Users;
+import pl.simplemethod.codebin.repository.UsersRepository;
 
+import javax.servlet.http.HttpServletResponse;
+import java.io.IOException;
 import java.io.UnsupportedEncodingException;
 import java.net.MalformedURLException;
 
 @RestController
 @RequestMapping("paypal")
 public class PayPalController {
 
+    private UsersRepository usersRepository;
+
     private PayPalBillingPlan payPalBillingPlan;
     private PayPalBillingAgreement payPalBillingAgreement;
 
+    private static String planId;
+    private static final String PAYMENT_ACCEPT_URL = "http://127.0.0.1/dashboard.html#!/payment-accept";
+
     @Autowired
-    public PayPalController(PayPalBillingPlan payPalBillingPlan, PayPalBillingAgreement payPalBillingAgreement) {
+    public PayPalController(PayPalBillingPlan payPalBillingPlan, PayPalBillingAgreement payPalBillingAgreement,
+                            UsersRepository usersRepository) {
         this.payPalBillingPlan = payPalBillingPlan;
         this.payPalBillingAgreement = payPalBillingAgreement;
+        this.usersRepository = usersRepository;
     }
 
     /**
      * Define and create billing plan and billing agreement.
      * Redirects response to returned URL
      */
-    @GetMapping("/subscribe")
-    public @ResponseBody ResponseEntity subscribe() {
-        HttpHeaders headers = new HttpHeaders();
-        headers.setContentType(MediaType.APPLICATION_JSON);
-
+    @GetMapping(path = "/subscribe")
+    public void subscribe(HttpServletResponse response) {
         try {
             Plan plan = payPalBillingPlan.create();
             Agreement agreement = payPalBillingAgreement.define(plan.getId());
+            planId = plan.getId();
 
-            JSONObject body = new JSONObject();
-            body.put("url", payPalBillingAgreement.create(agreement));
-            return new ResponseEntity<>(body.toString(), headers, HttpStatus.valueOf(200));
+            response.sendRedirect(payPalBillingAgreement.create(agreement));
         } catch (PayPalRESTException e) {
             System.err.println(e.getDetails());
         } catch (MalformedURLException | UnsupportedEncodingException e) {
             e.printStackTrace();
+        } catch (IOException e) {
+            e.printStackTrace();
         }
-
-        return new ResponseEntity<>("", headers, HttpStatus.BAD_REQUEST);
     }
 
     /**
      * Executes successfully created billing agreement
      * @param token Token which is automatically assigned to billing agreement
      */
-    @GetMapping("/subscribe-success")
-    public void success(@RequestParam String token) {
+    @GetMapping("/payment-success")
+    public void success(HttpServletResponse response, @RequestParam String token, @CookieValue("id") Integer id) {
         try {
             payPalBillingAgreement.execute(token);
+
+            Users users = usersRepository.getFirstById(id);
+            users.setSubscription(planId);
+            usersRepository.save(users);
         } catch (PayPalRESTException e) {
             System.err.println(e.getDetails());
         }
+
+        try {
+            response.sendRedirect(PAYMENT_ACCEPT_URL);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
     }
 }