Merge pull request #59 from xTeamTEICM/dev

Dev
xTeamTEICM · Dec 18, 2017 · 0385c67 · 0385c67
2 parents 3e271b3 + 8b3ec83
commit 0385c67
Show file tree

Hide file tree

Showing 38 changed files with 1,019 additions and 5,854 deletions.
diff --git a/.env b/.env
@@ -23,4 +23,7 @@ MAIL_ENCRYPTION=null
 
 PUSHER_APP_ID=
 PUSHER_APP_KEY=
-PUSHER_APP_SECRET=
+PUSHER_APP_SECRET=
+
+FCM_SERVER_KEY=AAAAdFX6a_s:APA91bFd8ImrkEBtsHfMnPUISRvFkyHcXoPme5VKMC-I2028ybYLY_6cRmGIq8gjrHEA1iRSuPJjtoQ_YwvxkdZknYHBJ5gXnWDTnCtQtmJSNqIdv4TGwmpFyDjGA1rZquFsgET_9tK9
+FCM_SENDER_ID=499658681339
diff --git a/app/category.php → app/Category.php b/app/category.php → app/Category.php
diff --git a/app/Console/Commands/helloWorldController.php b/app/Console/Commands/helloWorldController.php
diff --git a/app/Discounts.php b/app/Discounts.php
diff --git a/...p/Controllers/AuthApi/LoginController.php → ...Http/Controllers/Auth/LoginController.php b/...p/Controllers/AuthApi/LoginController.php → ...Http/Controllers/Auth/LoginController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\AuthApi;
+namespace App\Http\Controllers\Auth;
 
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;

diff --git a/...ontrollers/AuthApi/RegisterController.php → ...p/Controllers/Auth/RegisterController.php b/...ontrollers/AuthApi/RegisterController.php → ...p/Controllers/Auth/RegisterController.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Controllers\AuthApi;
+namespace App\Http\Controllers\Auth;
 
 use App\User;
 use Illuminate\Http\Request;

diff --git a/app/Http/Controllers/categoryController.php → app/Http/Controllers/CategoryController.php b/app/Http/Controllers/categoryController.php → app/Http/Controllers/CategoryController.php
@@ -8,30 +8,36 @@
 
 class categoryController extends Controller
 {
-    //
-    public function list () {
+
+    public function list()
+    {
         return category::all();
     }
-    public function get($id){
+
+    public function get($id)
+    {
         return category::find($id);
     }
-    public function post(){
-        //TODO EXEI Security issue -> mporei o opoiosdipote na valei katigoria
+
+    public function post()
+    {
         $category = new category();
         $category->title = Input::get('title');
         $category->save();
         return $category;
     }
-    public function update(){
+
+    public function update()
+    {
         $category = category::find(Input::get('id'));
         $category->title = Input::get('title');
         $category->save();
         return $category;
     }
-    public function remove($title){
-        //$category = new category();
+
+    public function remove($title)
+    {
         $category = category::find($title);
-        //return  $category;
         $category->delete();
     }
 

diff --git a/app/Http/Controllers/DeviceTokenController.php b/app/Http/Controllers/DeviceTokenController.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Http\Controllers;
+
+use App\User;
+use Illuminate\Http\Request;
+
+class deviceTokenController extends Controller
+{
+    public function setDeviceToken(Request $request)
+    {
+        $this->validate($request, [
+            'deviceToken' => 'required|String',
+        ]);
+
+        $id = auth('api')->user()->id;
+        User::query()
+            ->where("id", "=", $id)
+            ->update(['deviceToken' => request('deviceToken')]);
+    }
+}
diff --git a/app/Http/Controllers/discountController.php → app/Http/Controllers/DiscountController.php b/app/Http/Controllers/discountController.php → app/Http/Controllers/DiscountController.php
@@ -12,51 +12,37 @@
 
 class discountController extends Controller
 {
-    public function list(){
-
+    public function list()
+    {
         return Discount::all();
-
     }
 
 
-    public function get($id){
-
+    public function get($id)
+    {
         $request = new Request();
         $request['id'] = $id;
 
         $data = $this->validate($request, [
             'id' => 'required|numeric'
         ]);
 
-
-
         return Discount::query()->where('shopId', '=', $data['id'])->first();
-
-
-
-
     }
 
-    public function post(Request $request){
-
+    public function post(Request $request)
+    {
         $data = $this->validate($request, [
-
+            'shopId' => 'required|numeric',
             'category' => 'required|numeric',
             'originalPrice' => 'required|numeric',
             'currentPrice' => 'required|numeric',
             'description' => 'required|string',
             'image' => 'required|string'
         ]);
 
-        //trexei alla den ksero giati, einai arga kleinoun ta matia, i need coffeeeeeeeeeee
-
-        $userId = Auth::user()->id;
-        $shopId = Shop::query()->where('ownerId','=',$userId)->value('id');
-
-
-
         $discount = new Discount();
-        $discount->shopId = $shopId;
+        $discount->shopId = $data['shopId'];
         $discount->category = $data['category'];
         $discount->originalPrice = $data['originalPrice'];
         $discount->currentPrice = $data['currentPrice'];
@@ -65,18 +51,26 @@ public function post(Request $request){
 
         $discount->save();
         $discount->push();
-        return $discount;
 
+        $fcm = new FCMController();
+        $fcm->sentToMultiple(
+            User::pluck('deviceToken')->toArray(),
+            'Υπάρχουν νέες προσφορές',
+            'Δείτε τώρα τις νέες προσφορές',
+            [],//data
+            'postedNewDiscount'
+        );
 
+        return $discount;
     }
 
 
-    public function put($id, Request $request){
-
+    public function put($id, Request $request)
+    {
         $request['id'] = $id;
 
         $data = $this->validate($request, [
-
+            'shopId' => 'required|numeric',
             'id' => 'required|numeric',
             'category' => 'required|numeric',
             'originalPrice' => 'required|numeric',
@@ -85,15 +79,8 @@ public function put($id, Request $request){
             'image' => 'required|string'
         ]);
 
-
-
-
-
-        $userId = Auth::user()->id;
-        $shopId = Shop::query()->where('ownerId','=',$userId)->value('id');
-
-        $discount = Discount::query()->where('shopId','=',$shopId)
-                                    ->where('id', '=', $data['id'])->first();
+        $discount = Discount::query()->where('shopId', '=', $data['shopId'])
+            ->where('id', '=', $data['id'])->first();
 
         if ($discount != null) {
             $discount->category = $data['category'];
@@ -102,33 +89,24 @@ public function put($id, Request $request){
             $discount->description = $data['description'];
             $discount->image = $data['image'];
 
-
             $discount->save();
             $discount->push();
             return $discount;
-        }
-
-        else {
-
+        } else {
             return "";
         }
     }
 
 
-    public function delete($id)
+    public function delete($id, Request $request)
     {
-        $request = new Request();
         $request['id'] = $id;
-
         $data = $this->validate($request, [
+            'shopId' => 'required|numeric',
             'id' => 'required|numeric'
         ]);
 
-        $userId = Auth::user()->id;
-        $shopId = Shop::query()->where('ownerId','=',$userId)->value('id');
-
-        $discount = Discount::query()->where('shopId','=',$shopId)
-            ->find($data['id']);
+        $discount = Discount::query()->where('shopId', '=', $data['shopId'])->find($data['id']);
 
         if ($discount != null) {
             $discount->delete();

diff --git a/app/Http/Controllers/FCMController.php b/app/Http/Controllers/FCMController.php
@@ -0,0 +1,66 @@
+<?php
+
+namespace App\Http\Controllers;
+
+
+use LaravelFCM\Facades\FCM;
+use LaravelFCM\Message\OptionsBuilder;
+use LaravelFCM\Message\PayloadDataBuilder;
+use LaravelFCM\Message\PayloadNotificationBuilder;
+
+class FCMController extends Controller
+{
+    public function sentToOne($userToken, $Title, $Body, $Data, $ClickAction)
+    {
+        $optionBuilder = new OptionsBuilder();
+        $optionBuilder->setTimeToLive(60 * 20);
+
+        $notificationBuilder = new PayloadNotificationBuilder($Title);
+        $notificationBuilder->setBody($Body)->setSound('default')->setClickAction($ClickAction);
+
+        $dataBuilder = new PayloadDataBuilder();
+        $dataBuilder->addData($Data);
+
+        $option = $optionBuilder->build();
+        $notification = $notificationBuilder->build();
+        $data = $dataBuilder->build();
+
+        $downstreamResponse = FCM::sendTo($userToken, $option, $notification, $data);
+
+        //return Array - you must remove all this tokens in your database
+        $downstreamResponse->tokensToDelete();
+
+        //return Array (key : oldToken, value : new token - you must change the token in your database )
+        $downstreamResponse->tokensToModify();
+
+        //return Array - you should try to resend the message to the tokens in the array
+        $downstreamResponse->tokensToRetry();
+    }
+
+    public function sentToMultiple($userTokens, $Title, $Body, $Data, $ClickAction)
+    {
+        $optionBuilder = new OptionsBuilder();
+        $optionBuilder->setTimeToLive(60 * 20);
+
+        $notificationBuilder = new PayloadNotificationBuilder($Title);
+        $notificationBuilder->setBody($Body)->setSound('default')->setClickAction($ClickAction);
+
+        $dataBuilder = new PayloadDataBuilder();
+        $dataBuilder->addData($Data);
+
+        $option = $optionBuilder->build();
+        $notification = $notificationBuilder->build();
+        $data = $dataBuilder->build();
+
+        $downstreamResponse = FCM::sendTo($userTokens, $option, $notification, $data);
+
+        //return Array - you must remove all this tokens in your database
+        $downstreamResponse->tokensToDelete();
+
+        //return Array (key : oldToken, value : new token - you must change the token in your database )
+        $downstreamResponse->tokensToModify();
+
+        //return Array - you should try to resend the message to the tokens in the array
+        $downstreamResponse->tokensToRetry();
+    }
+}