get all; delete

app/Http/Business/ImagesBusiness.php

@@ -3,11 +3,13 @@
 namespace App\Http\Business;
 
 use App\Http\DBO\ImageUploadDbo;
+use Carbon\Carbon;
 use Exception;
 use Luticate\Auth\DBO\LuticateUsersDbo;
 use Luticate\Utils\LuBusiness;
 use App\Http\DataAccess\ImagesDataAccess;
 use App\Http\DBO\ImagesDbo;
+use Luticate\Utils\LuLog;
 
 class ImagesBusiness extends LuBusiness {
     
@@ -26,6 +28,21 @@ class ImagesBusiness extends LuBusiness {
         "-" . time() . "." . self::IMAGES_FORMAT;
     }
 
+    public static function getAllLite($only_mine, LuticateUsersDbo $_user, $page = 0, $perPage = 20000000)
+    {
+        return ImagesDataAccess::getAllLite($only_mine, $_user, $page, $perPage);
+    }
+
+    public static function getRawById($image_id)
+    {
+        /**
+         * @var $dbo ImagesDbo
+         */
+        $dbo = self::getById($image_id);
+        echo file_get_contents($dbo->getPath());
+        exit;
+    }
+
     public static function upload(ImageUploadDbo $image, LuticateUsersDbo $_user)
     {
         $path = self::generateImagePath($image, $_user);
@@ -33,6 +50,7 @@ class ImagesBusiness extends LuBusiness {
         $dbo = new ImagesDbo();
         $dbo->setUserId($_user->getId());
         $dbo->setPath($path);
+        $dbo->setDate(Carbon::now());
 
         $image->getImage()->scaleImage(420, 420, true);
         $image->getImage()->setImageFormat(self::IMAGES_FORMAT);
@@ -43,6 +61,7 @@ class ImagesBusiness extends LuBusiness {
         }
         catch (Exception $e)
         {
+            LuLog::log($e);
             try
             {
                 unlink($path);
@@ -58,10 +77,22 @@ class ImagesBusiness extends LuBusiness {
 
     public static function del($image_id, LuticateUsersDbo $_user)
     {
+        /**
+         * @var $imageDbo ImagesDbo
+         */
         $imageDbo = self::getById($image_id);
         if ($imageDbo->getUserId() != $_user->getId()) {
             self::unauthorized("You do not own this image");
         }
+        self::deleteById($imageDbo->getId());
+        try
+        {
+            unlink($imageDbo->getPath());
+        }
+        catch (Exception $e)
+        {
+            LuLog::log($e);
+        }
         return true;
     }
 }

app/Http/Controller/ImagesController.php

@@ -15,6 +15,16 @@ class ImagesController extends LuController {
         return new ImagesBusiness();
     }
 
+    public function getAll($only_mine, LuticateUsersDbo $_user, $page = 0, $perPage = 20000000)
+    {
+        return ImagesBusiness::getAllLite($only_mine == "true", $_user, $page, $perPage);
+    }
+
+    public function getRawById($image_id)
+    {
+        return ImagesBusiness::getRawById($image_id);
+    }
+
     public function upload(ImageUploadDbo $image, LuticateUsersDbo $_user)
     {
         return ImagesBusiness::upload($image, $_user);

app/Http/DBO/ImagesDbo.php

@@ -16,7 +16,9 @@ class ImagesDbo extends LuDbo {
         return array(
             "Id" => $this->_id,
             "UserId" => $this->_userId,
-            "Path" => $this->_path
+            "Path" => $this->_path,
+            "Date" => $this->_date,
+            "Name" => $this->_name
         );
     }
 
@@ -32,6 +34,12 @@ class ImagesDbo extends LuDbo {
         if (isset($json["Path"])) {
             $dbo->setPath($json["Path"]);
         }
+        if (isset($json["Date"])) {
+            $dbo->setDate($json["Date"]);
+        }
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
         return $dbo;
     }
 
@@ -41,6 +49,8 @@ class ImagesDbo extends LuDbo {
         $dbo->setId(42);
         $dbo->setUserId(42);
         $dbo->setPath("sample string");
+        $dbo->setDate("sample string");
+        $dbo->setName("sample string");
         return $dbo;
     }
 
@@ -82,4 +92,30 @@ class ImagesDbo extends LuDbo {
     {
         $this->_path = $value;
     }
+
+    /**
+     * @var timestamp without time zone
+     */
+    protected $_date;
+    public function getDate()
+    {
+        return $this->_date;
+    }
+    public function setDate($value)
+    {
+        $this->_date = $value;
+    }
+
+    /**
+     * @var text
+     */
+    protected $_name;
+    public function getName()
+    {
+        return $this->_name;
+    }
+    public function setName($value)
+    {
+        $this->_name = $value;
+    }
 }

app/Http/DataAccess/ImagesDataAccess.php

@@ -2,6 +2,8 @@
 
 namespace App\Http\DataAccess;
 
+use App\Http\DataAccess\SP\SpGetImages;
+use Luticate\Auth\DBO\LuticateUsersDbo;
 use Luticate\Utils\LuDataAccess;
 use App\Http\DataAccess\Models\Images;
 use App\Http\DBO\ImagesDbo;
@@ -11,4 +13,9 @@ class ImagesDataAccess extends LuDataAccess {
     {
         return new Images();
     }
+
+    public static function getAllLite($only_mine, LuticateUsersDbo $_user, $page = 0, $perPage = 20000000)
+    {
+        return SpGetImages::getMultipleJson($only_mine, $_user->getId(), $page, $perPage);
+    }
 }

app/Http/DataAccess/Models/ImagesModel.php

@@ -28,6 +28,8 @@ class ImagesModel extends LuModel
         $dbo->setId($this->id);
         $dbo->setUserId($this->user_id);
         $dbo->setPath($this->path);
+        $dbo->setDate($this->date);
+        $dbo->setName($this->name);
 
         return $dbo;
     }
@@ -45,6 +47,8 @@ class ImagesModel extends LuModel
         $model->id = $dbo->getId();
         $model->user_id = $dbo->getUserId();
         $model->path = $dbo->getPath();
+        $model->date = $dbo->getDate();
+        $model->name = $dbo->getName();
 
         return $model;
     }

app/Http/DataAccess/SP/SpGetImages.php

@@ -0,0 +1,160 @@
+<?php
+
+/**
+ * AUTO GENERATED BY LUTICATE GENERATOR
+ * ANY CHANGES WILL BE OVERWRITTEN
+ */
+
+namespace App\Http\DataAccess\SP;
+
+use Luticate\Utils\LuSpDbo;
+use Luticate\Utils\LuMultipleDbo;
+use Luticate\Utils\LuStringUtils;
+use Illuminate\Support\Facades\DB;
+
+class SpGetImages extends LuSpDbo {
+
+    /**
+    * @param $dam
+    * @return \App\Http\DataAccess\SP\SpGetImages|null
+    */
+    protected static function damToDbo($dam)
+    {
+        if (is_null($dam))
+            return null;
+        $dbo = new SpGetImages();
+
+        $dbo->setId(LuStringUtils::convertJsonString($dam->id));
+        $dbo->setName(LuStringUtils::convertJsonString($dam->name));
+        $dbo->setUserId(LuStringUtils::convertJsonString($dam->user_id));
+        $dbo->setDate(LuStringUtils::convertJsonString($dam->date));
+
+        return $dbo;
+    }
+
+
+    /**
+    * @param $_only_mine boolean
+    * @param $_user_id_me integer
+    * @return \App\Http\DataAccess\SP\SpGetImages[];
+    */
+    public static function execute($_only_mine, $_user_id_me)
+    {
+        $values = DB::select('SELECT to_json(data.id) AS id, to_json(data.name) AS name, to_json(data.user_id) AS user_id, to_json(data.date) AS date FROM sp_get_images(:_only_mine, :_user_id_me) data', array(":_only_mine" => $_only_mine, ":_user_id_me" => $_user_id_me));
+        $dboValues = array();
+        foreach ($values as $value)
+            $dboValues[] = self::damToDbo($value);
+        return $dboValues;
+    }
+
+    /**
+    * @param $_only_mine boolean
+    * @param $_user_id_me integer
+    * @param $page int The page number, 0 based
+    * @param $perPage int The number of items per page
+    * @return \Luticate\Utils\LuMultipleDbo;
+    */
+    public static function getMultipleJson($_only_mine, $_user_id_me, $page, $perPage)
+    {
+        $values = DB::select('SELECT (SELECT count(*) FROM sp_get_images(:_only_mine, :_user_id_me)) as count, (SELECT json_agg(q) FROM (SELECT * FROM sp_get_images(:_only_mine, :_user_id_me) OFFSET (:page::int * :perPage::int) LIMIT :perPage) q) as data',
+            array(":_only_mine" => $_only_mine, ":_user_id_me" => $_user_id_me, ":page" => $page, ":perPage" => $perPage));
+        $value = $values[0];
+        if (is_null($value->data))
+        {
+            $value->data = '[]';
+        }
+        $data = LuStringUtils::convertJsonString($value->data);
+        return new LuMultipleDbo($value->count, $data);
+    }
+
+    public function jsonSerialize()
+    {
+        return array(
+            "Id" => $this->_id,
+            "Name" => $this->_name,
+            "UserId" => $this->_userId,
+            "Date" => $this->_date
+        );
+    }
+
+    public static function jsonDeserialize($json)
+    {
+        $dbo = new SpGetImages();
+        if (isset($json["Id"])) {
+            $dbo->setId($json["Id"]);
+        }
+        if (isset($json["Name"])) {
+            $dbo->setName($json["Name"]);
+        }
+        if (isset($json["UserId"])) {
+            $dbo->setUserId($json["UserId"]);
+        }
+        if (isset($json["Date"])) {
+            $dbo->setDate($json["Date"]);
+        }
+        return $dbo;
+    }
+
+    public static function generateSample()
+    {
+        $dbo = new SpGetImages();
+        $dbo->setId(42);
+        $dbo->setName("sample string");
+        $dbo->setUserId(42);
+        $dbo->setDate("sample string");
+        return $dbo;
+    }
+
+
+    /**
+    * @var integer
+    */
+    protected $_id;
+    public function getId()
+    {
+        return $this->_id;
+    }
+    public function setId($value)
+    {
+        $this->_id = $value;
+    }
+
+    /**
+    * @var text
+    */
+    protected $_name;
+    public function getName()
+    {
+        return $this->_name;
+    }
+    public function setName($value)
+    {
+        $this->_name = $value;
+    }
+
+    /**
+    * @var integer
+    */
+    protected $_userId;
+    public function getUserId()
+    {
+        return $this->_userId;
+    }
+    public function setUserId($value)
+    {
+        $this->_userId = $value;
+    }
+
+    /**
+    * @var timestamp without time zone
+    */
+    protected $_date;
+    public function getDate()
+    {
+        return $this->_date;
+    }
+    public function setDate($value)
+    {
+        $this->_date = $value;
+    }
+}

app/Http/DataAccess/SP/src/sp_get_images.sql

@@ -0,0 +1,4 @@
+
+        SELECT i.id, i.name, i.user_id, i.date
+        FROM images i
+        WHERE (CASE WHEN _only_mine THEN i.user_id = _user_id_me ELSE TRUE END)

app/Http/routes.php

@@ -17,8 +17,9 @@ $image_id = "{image_id:$int}";
 
 $route->post("/api/effects/{effect}/apply", "Effects", "apply", Permissions::UPLOAD);
 
+$route->get("/api/images", "Images", "getAll");
+$route->get("/api/images/$image_id", "Images", "getRawById");
 $route->post("/api/images/upload", "Images", "upload", Permissions::UPLOAD);
-
 $route->post("/api/images/$image_id/del", "Images", "del", Permissions::UPLOAD);
 
-//sleep(2);
+sleep(2);

public/app/app.js

@@ -26,20 +26,18 @@ angular.module('app', [
                 }]
             });
 
-            $stateProvider.state('home', {
+            $stateProvider.state('images', {
                 url:'/',
                 parent: 'root',
-                title: "Home",
-                reloadOnSearch: false,
-                templateUrl:'views/home.html',
-                controller:'HomeController'
+                title: "Images",
+                templateUrl:'views/images.html',
+                controller:'ImagesController'
             });
 
             $stateProvider.state('login', {
                 url:'/login',
                 parent: 'root',
                 title: "Login",
-                reloadOnSearch: false,
                 templateUrl:'views/login.html',
                 controller:'LoginController'
             });
@@ -48,7 +46,6 @@ angular.module('app', [
                 url:'/signUp',
                 parent: 'root',
                 title: "Sign Up",
-                reloadOnSearch: false,
                 templateUrl:'views/signup.html',
                 controller:'SignUpController'
             });
@@ -57,11 +54,18 @@ angular.module('app', [
                 url:'/upload',
                 parent: 'root',
                 title: "Upload",
-                reloadOnSearch: false,
                 templateUrl:'views/upload.html',
                 controller:'UploadController'
             });
 
+            /*$stateProvider.state('images', {
+                url:'/images',
+                parent: 'root',
+                title: "Images",
+                templateUrl:'views/images.html',
+                controller:'ImagesController'
+            });*/
+
             $urlRouterProvider.otherwise('/');
 
             $httpProvider.interceptors.push(['luticateAuthCache', '$injector', '$q',

public/app/controllers/home.controller.js

@@ -1,4 +0,0 @@
-angular.module('app')
-    .controller('HomeController', ['$scope', '$state', '$mdDialog',
-        function($scope, $state, $mdDialog) {
-    }]);

public/app/controllers/images.controller.js

@@ -0,0 +1,36 @@
+angular.module('app')
+    .controller('ImagesController', ['$scope', '$state', '$mdDialog', 'ImagesBusiness', 'luticateAuthCache', 'errorDialogMd',
+        function($scope, $state, $mdDialog, ImagesBusiness, luticateAuthCache, errorDialogMd) {
+
+            $scope.luticateAuthCache = luticateAuthCache;
+
+            var promiseLoad = {
+                id: "promiseLoad",
+                loaderGroups: ["images"]
+            };
+            
+            $scope.options = {
+                page: 0,
+                perPage: 30,
+                only_mine: luticateAuthCache.getUser() != null
+            };
+
+            $scope.images = [];
+
+            $scope.reload = function()
+            {
+                ImagesBusiness.getAll($scope.options, promiseLoad).then(function(data)
+                {
+                    $scope.images = data;
+                }, errorDialogMd.errorDialog);
+            };
+
+            $scope.delete = function(image_id)
+            {
+                ImagesBusiness.delete({image_id: image_id}, promiseLoad).then(function (data) {
+                    $scope.reload();
+                }, errorDialogMd.errorDialog);
+            };
+
+            $scope.reload();
+    }]);

public/app/controllers/login.controller.js

@@ -20,7 +20,7 @@ angular.module('app')
                     password: $scope.user.Password
                 }).then(function(data)
                 {
-                    $state.go("home");
+                    $state.go("images");
                 }, function (error) {
                     $scope.error = error;
                 });

public/app/controllers/toolbar.controller.js

@@ -22,7 +22,7 @@ angular.module('app')
                 $scope.logout = function () {
                         luticateAuthUsers.logout().then(function(data)
                         {
-                                $state.go("home");
+                                $state.go("images");
                         });
                 }
         }]);

public/app/index.html

@@ -49,10 +49,10 @@
     <!-- Controller -->
     <script src="controllers/sidebar.controller.js"></script>
     <script src="controllers/toolbar.controller.js"></script>
-    <script src="controllers/home.controller.js"></script>
     <script src="controllers/login.controller.js"></script>
     <script src="controllers/signup.controller.js"></script>
     <script src="controllers/upload.controller.js"></script>
+    <script src="controllers/images.controller.js"></script>
 
     <!-- Modal Controller -->
 

public/app/views/home.html

@@ -1,5 +0,0 @@
-<div layout="column" layout-fill layout-align="top center">
-    <p>
-        Welcome to <span class="strike">500px</span> 420px!
-    </p>
-</div>

public/app/views/images.html

@@ -0,0 +1,14 @@
+<div layout="column" layout-fill layout-align="top center">
+    <div class="col-xs-12" lu-busy="images">
+        <div class="col-xs-12">
+            <md-checkbox ng-model="options.only_mine" ng-show="luticateAuthCache.getUser() != null" ng-change="reload()">
+                Only my images
+            </md-checkbox>
+        </div>
+        <div ng-repeat="image in images.Data" class="col-xs-3">
+            <img ng-src="/api/images/{{image.Id}}" />
+            <p>{{image.Name}}</p>
+            <button class="btn btn-danger" ng-click="delete(image.Id)" ng-show="image.UserId == luticateAuthCache.getUser().Id">Delete</button>
+        </div>
+    </div>
+</div>

public/app/views/sidebar.html

@@ -1,6 +1,6 @@
 <md-sidenav layout="column" class="md-sidenav-left md-whiteframe-z2" md-component-id="left" md-is-locked-open="$mdMedia('gt-md')">
     <md-toolbar class="md-theme-indigo">
-        <h1 class="md-toolbar-tools"><a ui-sref="home">420px</a></h1>
+        <h1 class="md-toolbar-tools"><a ui-sref="images">420px</a></h1>
     </md-toolbar>
     <md-content layout-padding ng-controller="SideBarController">
         <div lu-busy="sidebar">

public/sdk/Business/images.js

@@ -9,6 +9,8 @@
 
         Business.getAll = ImagesDataAccess.getAll;
 
+        Business.delete = ImagesDataAccess.delete;
+
         Business.upload = function(data, promise)
         {
             data.image = btoa(data.image);

public/sdk/DataAccess/images.js

@@ -14,6 +14,11 @@
             return luticateRequest.get(entry_point, data, promise);
         };
 
+        DataAccess.delete = function(data, promise)
+        {
+            return luticateRequest.post(entry_point + data.image_id + "/del", null, null, promise);
+        };
+
         DataAccess.upload = function(data, promise)
         {
             return luticateRequest.post(entry_point + "upload", {image: JSON.stringify(data)}, null, promise);