added delete api route that is compliant with the dotnet cli

Author: MelonSmasher

README.md

@@ -16,7 +16,7 @@ Chocolatier allows you to host your own NuGet repository on any platform that ca
 
 A live example of Chocolatier can be found at [choco.sage.edu](https://choco.sage.edu). The example site is also utilizing my [NuGetReflector](https://github.com/MelonSmasher/NuGetReflector).
 
-The current release of Chocolatier is based on Laravel 5.4.
+The current release of Chocolatier is based on Laravel 5.8.
 
 ## Installation:
 

app/Choco/NuGet/NugetPackage.php

@@ -5,27 +5,29 @@
 use Illuminate\Database\Eloquent\Model;
 use App\Choco\Atom\AtomElement;
 use App\Model\User;
+use Illuminate\Support\Facades\Storage;
 
 /**
  * @property string hash
  * @property string hash_algorithm
- * @property int    size
- * @property int    user_id
- * @property mixed  version
- * @property mixed  is_prerelease
- * @property mixed  package_id
- * @property mixed  authors
- * @property mixed  updated_at
- * @property int    download_count
+ * @property int size
+ * @property int user_id
+ * @property mixed version
+ * @property mixed is_prerelease
+ * @property mixed package_id
+ * @property mixed authors
+ * @property mixed updated_at
+ * @property int download_count
  * @property string tags
- * @property bool   is_absolute_latest_version
- * @property bool   is_listed
- * @property int    version_download_count
- * @property bool   is_latest_version
- * @property mixed  icon_url
- * @property mixed  owners
+ * @property bool is_absolute_latest_version
+ * @property bool is_listed
+ * @property int version_download_count
+ * @property bool is_latest_version
+ * @property mixed icon_url
+ * @property mixed owners
  */
-class NugetPackage extends Model {
+class NugetPackage extends Model
+{
     protected $fillable = [
         'package_id', /* string */
         'version', /* string */
@@ -69,52 +71,98 @@ public function user()
         return $this->belongsTo(User::class);
     }
 
+    /**
+     * @return mixed
+     */
     public function versions()
     {
         return static::where('package_id', $this->package_id)
             ->orderBy('created_at', 'desc')
             ->get();
     }
+
+    /**
+     * @return string
+     */
     public function getNupkgPath()
     {
         return storage_path() . "/app/packages/{$this->package_id}.{$this->version}.nupkg";
     }
 
+    /**
+     * @return string
+     */
+    public function getNupkgName()
+    {
+        return "{$this->package_id}.{$this->version}.nupkg";
+    }
+
+    /**
+     * @return bool|null
+     * @throws \Exception
+     */
+    public function delete()
+    {
+        Storage::delete("packages/{$this->getNupkgName()}");
+        return parent::delete();
+    }
+
+    /**
+     * @return string
+     */
     public function getGalleryUrl()
     {
         return route('packages.show', [$this->package_id]);
     }
 
+    /**
+     * @return string
+     */
     public function getApiQuery()
     {
         return "Packages(Id='{$this->package_id}',Version='{$this->version}')";
     }
 
+    /**
+     * @return string
+     */
     public function getApiUrl()
     {
         return route('api.package', ['id' => $this->package_id, 'version' => $this->version]);
     }
 
+    /**
+     * @return string
+     */
     public function getDownloadUrl()
     {
         return route('api.download', ['id' => $this->package_id, 'version' => $this->version]);
     }
 
+    /**
+     * @return array
+     */
     public function getOwners()
     {
         return array_map('trim', explode(',', $this->owners));
     }
 
+    /**
+     * @return array
+     */
     public function getAuthors()
     {
         return array_map('trim', explode(',', $this->authors));
     }
 
+    /**
+     * @return mixed|string
+     */
     public function getIconUrl()
     {
         return !empty($this->icon_url)
-               && (strpos($this->icon_url, 'http://') === 0
-                   || strpos($this->icon_url, 'https://') === 0) ? $this->icon_url : '/images/packageDefaultIcon.png';
+        && (strpos($this->icon_url, 'http://') === 0
+            || strpos($this->icon_url, 'https://') === 0) ? $this->icon_url : '/images/packageDefaultIcon.png';
     }
 
     /**

app/Http/Controllers/ApiController.php

@@ -4,19 +4,18 @@
 
 use DOMDocument;
 
-use function GuzzleHttp\Psr7\str;
+
 use Illuminate\Support\Facades\Input;
-use Illuminate\Support\Facades\Log;
 use Illuminate\Support\Facades\Response;
 use Illuminate\Support\Facades\Storage;
 use App\Choco\Atom\AtomElement;
-use App\Http\Requests;
 use App\Http\Requests\NugetRequest;
 use App\Nuget\NupkgFile;
 use App\Repositories\NugetQueryBuilder;
 use App\Choco\NuGet\NugetPackage;
 
-class ApiController extends Controller {
+class ApiController extends Controller
+{
     private $queryBuilder;
 
     /**
@@ -61,8 +60,7 @@ public function upload(NugetRequest $request)
         $user = $request->getUser();
         $file = $request->getUploadedFile('package');
 
-        if($file === false)
-        {
+        if ($file === false) {
             \Log::error('package not uploaded on second check');
             return Response('package not uploaded on second check', 500);
         }
@@ -74,6 +72,35 @@ public function upload(NugetRequest $request)
         return Response::make('OK');
     }
 
+    /**
+     * @param NugetRequest $request
+     * @param $id
+     * @param $version
+     * @return mixed
+     */
+    public function delete(NugetRequest $request, $id, $version)
+    {
+        $user = $request->getUser();
+        if ($user) {
+
+            $package = NugetPackage::where('package_id', $id)->where('version', $version)->firstOrFail();
+
+            $is_latest_version = $package->is_latest_version;
+            $is_absolute_latest_version = $package->is_absolute_latest_version;
+
+            $package->delete();
+            $nextVersion = NugetPackage::orderby('created_at', 'desc')->first();
+
+            if ($nextVersion) {
+                if (!$nextVersion->is_latest_version) $nextVersion->is_latest_version = $is_latest_version;
+                if (!$nextVersion->is_absolute_latest_version) $nextVersion->is_absolute_latest_version = $is_absolute_latest_version;
+                if($nextVersion->isDirty()) $nextVersion->save();
+            }
+            return Response::make('No Content', 204);
+        }
+        return Response::make('Unauthorized', 403);
+    }
+
     /**
      * Download a package.
      *
@@ -93,16 +120,14 @@ public function download($id, $version = null)
                 ->where('version', $version)
                 ->first();
         }
-        if ($package === null)
-        {
+        if ($package === null) {
             return Response::make('not found', 404);
         }
         $package->version_download_count++;
         $package->save();
 
         foreach (NugetPackage::where('package_id', $id)
-                     ->get() as $vPackage)
-        {
+                     ->get() as $vPackage) {
             $vPackage->download_count++;
             $vPackage->save();
         }
@@ -118,8 +143,7 @@ public function download($id, $version = null)
      */
     public function search($action)
     {
-        if ($action == 'count' || $action == '$count')
-        {
+        if ($action == 'count' || $action == '$count') {
             $count = $this->processSearchQuery()
                 ->count();
 
@@ -168,8 +192,7 @@ public function package($id, $version)
             ->where('version', $version)
             ->first();
 
-        if ($package == null)
-        {
+        if ($package == null) {
             return $this->generateResourceNotFoundError('Packages');
         }
 
@@ -211,25 +234,21 @@ public function updates()
         //$version_constraints= explode('|', Input::get('versionConstraints'));//@todo ??
         //$target_frameworks= explode('|', Input::get('targetFrameworks'));//@todo ??
 
-        if (count($package_ids) != count($package_versions))
-        {
+        if (count($package_ids) != count($package_versions)) {
             return $this->generateError('Invalid version count', 'eu-US', 301);
         }
 
         // Query database.
         $packages = [];
-        foreach ($package_ids as $index => $id)
-        {
+        foreach ($package_ids as $index => $id) {
             $version = $package_versions[$index];
             $builder = NugetPackage::where('package_id', $id);
-            if (!$include_prerelease)
-            {
+            if (!$include_prerelease) {
                 $builder = $builder->where('is_prerelease', false);
             }
             $latest = $builder->orderBy('created_at', 'desc')
                 ->first();
-            if ($latest != null && $latest->version != $version)
-            {
+            if ($latest != null && $latest->version != $version) {
                 array_push($packages, $latest);
             }
         }
@@ -257,29 +276,23 @@ private function generateResourceNotFoundError($segmentName)
 
     /**
      * @param NugetPackage $package
-     * @param array        $properties
-     * @param AtomElement  $atomElement
+     * @param array $properties
+     * @param AtomElement $atomElement
      */
     private function addPackagePropertiesToAtomElement($package, $properties, $atomElement)
     {
-        foreach ($properties as $property)
-        {
-            if (!$this->queryBuilder->isProperty($property))
-            {
+        foreach ($properties as $property) {
+            if (!$this->queryBuilder->isProperty($property)) {
                 continue;
             }
 
             $mapping = $this->queryBuilder->getMapping($property);
 
-            if (array_has($mapping, 'function'))
-            {
+            if (array_has($mapping, 'function')) {
                 $func = $mapping['function'];
                 $value = $package->$func();
-            }
-            else
-            {
-                if (array_has($mapping, 'field'))
-                {
+            } else {
+                if (array_has($mapping, 'field')) {
                     $field = $mapping['field'];
                     $value = $package->$field;
                 }
@@ -297,14 +310,13 @@ private function addPackagePropertiesToAtomElement($package, $properties, $atomE
      * @param        $id
      * @param        $title
      * @param        $updated
-     * @param  mixed $count
+     * @param mixed $count
      * @return mixed
      */
     private function displayPackages($packages, $id, $title, $updated, $count = false)
     {
         $properties = Input::has('$select')
-            ? array_filter(explode(',', Input::get('$select')), function ($name)
-            {
+            ? array_filter(explode(',', Input::get('$select')), function ($name) {
                 return $this->queryBuilder->isProperty($name);
             })
             : $this->queryBuilder->getAllProperties();
@@ -314,8 +326,7 @@ private function displayPackages($packages, $id, $title, $updated, $count = fals
             ->setCount($count);
 
         /** @var NugetPackage $package */
-        foreach ($packages as $package)
-        {
+        foreach ($packages as $package) {
             $atomElement = $package->getAtomElement();
             $this->addPackagePropertiesToAtomElement($package, $properties, $atomElement);
             $atom->appendChild($atomElement);
@@ -340,10 +351,8 @@ private function processSearchQuery()
         // Query database.
         $eloquent = $this->queryBuilder->query(Input::get('$filter'), Input::get('$orderby'));
 
-        if (!empty($search_term))
-        {
-            $eloquent = $eloquent->where(function ($query) use ($search_term)
-            {
+        if (!empty($search_term)) {
+            $eloquent = $eloquent->where(function ($query) use ($search_term) {
                 $query->where('package_id', 'LIKE', "%$search_term%");
                 $query->orWhere('title', 'LIKE', "%$search_term%");
                 $query->orWhere('description', 'LIKE', "%$search_term%");
@@ -352,8 +361,7 @@ private function processSearchQuery()
                 $query->orWhere('authors', 'LIKE', "%$search_term%");
             });
         }
-        if (!$include_prerelease)
-        {
+        if (!$include_prerelease) {
             $eloquent->where('is_prerelease', false);
         }