delete package

Author: nsolov

src/cls/ZPM/DeletedPackage.cls

@@ -0,0 +1,25 @@
+Class ZPM.DeletedPackage Extends %Persistent
+{
+
+Property name As %String(MAXLEN = 50) [ Required ];
+
+Property version As %String [ Required ];
+
+Index NameVersion On (name, version) [ IdKey, Unique ];
+
+Storage Default
+{
+<Data name="DeletedPackageDefaultData">
+<Value name="1">
+<Value>%%CLASSNAME</Value>
+</Value>
+</Data>
+<DataLocation>^ZPM.DeletedPackageD</DataLocation>
+<DefaultData>DeletedPackageDefaultData</DefaultData>
+<IdLocation>^ZPM.DeletedPackageD</IdLocation>
+<IndexLocation>^ZPM.DeletedPackageI</IndexLocation>
+<StreamLocation>^ZPM.DeletedPackageS</StreamLocation>
+<Type>%Storage.Persistent</Type>
+}
+
+}

src/cls/ZPM/Owner.cls

@@ -0,0 +1,30 @@
+Class ZPM.Owner
+{
+
+/// Check if user is not UnknownUser
+ClassMethod IsAuth() As %Status
+{
+    If ($Username="UnknownUser") {
+        Return $$$ERROR($$$GeneralError, "Authentification required")
+    } 
+    Return $$$OK
+}
+
+ClassMethod IsOwner(packageName As %String) As %Status
+{
+    Set owner = ""
+    &sql(SELECT TOP 1 owner INTO :owner FROM ZPM.Package WHERE name = :packageName ORDER BY publishTS)
+    If ( (owner'="") && (owner '= $Username) ){
+        Return $$$ERROR($$$GeneralError, "Invalid package owner")
+    }
+    Return $$$OK
+}
+
+ClassMethod SaveOwner(packageName, packageVersion) As %Status
+{
+    Set owner = $Username
+    &sql(UPDATE ZPM.Package SET owner = :owner WHERE name = :packageName AND version = :packageVersion)
+    Return $$$OK
+}
+
+}

src/cls/ZPM/Package.cls

@@ -13,7 +13,7 @@ Property version As %String [ Required ];
 
 Index NameVersion On (name, version) [ IdKey, Unique ];
 
-Property owner As %String;
+Property owner As %String(%JSONINCLUDE = "NONE");
 
 Index Owner On owner;
 
@@ -203,6 +203,28 @@ ClassMethod VersionFind(pkg As %String = "", version As %String = "") As %String
   }
 }
 
+Trigger DeletePackage [ Event = DELETE, Foreach = row/object ]
+{
+  // delete DeployedPackage
+  New id,package,name,version
+  Set id = {ID}
+  Set package = ##class(Package).%OpenId(id)
+  Set name = package.name
+  Set version = package.version
+  &sql(DELETE FROM ZPM.DeployedPackage WHERE name = :name AND version = :version)
+}
+
+ClassMethod IsDeleted(name, version) As %Boolean
+{
+  Set count = 0
+  &sql(SELECT COUNT(1) INTO :count FROM DeletedPackage WHERE name = :name AND version = :version)
+  If (count = 0) {
+    Return 0
+  } Else {
+    Return 1
+  }
+}
+
 Method platformVersionsGet() As %ListOfDataTypes
 {
   Set tList = ##class(%ListOfDataTypes).%New()
@@ -227,12 +249,22 @@ Method platformVersionsGet() As %ListOfDataTypes
   Return tList
 }
 
-ClassMethod DeleteExistingPackages(pkg, version) As %Status
+ClassMethod DeleteExistingPackages(pkg As %String, version As %String, markDeleted As %Boolean = 0) As %Status
 {
   // delete all "proxy" packages
   &sql(DELETE FROM ZPM.Package WHERE Name = :pkg AND UpLink IS NOT NULL)
-
-  Do ..NameVersionDelete(pkg, version)
+  Set tSC = ..NameVersionDelete(pkg, version)
+  Return:$$$ISERR(tSC) tSC
+
+  If (markDeleted) {
+    Set count = 0
+    &sql(SELECT COUNT(1) INTO :count FROM ZPM.Package WHERE Name = :pkg)
+    If (count = 0) {
+      &sql(DELETE FROM ZPM.DeletedPackage WHERE name = :pkg)
+    } Else {
+      &sql(INSERT INTO ZPM.DeletedPackage(name, version) VALUES (:pkg, :version))
+    }
+  }
   Return 1
 }
 

src/cls/ZPM/Registry.cls

@@ -173,37 +173,52 @@ ClassMethod PackageInstaller(pkg As %String = "", version As %String = "") As %S
 /// Unpublish (delete) directly published package
 ClassMethod UnPublishPackage(pkg As %String = "", version As %String = "") As %Status
 {
-  If ($Username="UnknownUser") {
-    Return ..ReportHttpStatusCode(..#HTTP401UNAUTHORIZED)
+  Set tSC = $$$OK
+  Set tSC = ##class(ZPM.Owner).IsAuth()
+  If ($$$ISERR(tSC)) {
+    Return ..ReportHttpStatusCode(..#HTTP401UNAUTHORIZED, tSC)
   }
-  Set sc = $$$OK
   Set pkg = $$$lcase(pkg)
   Set pPackage = ##class(ZPM.Package).NameVersionOpen(pkg, version)
   If ('$IsObject(pPackage)) {
     Return ..ReportHttpStatusCode(..#HTTP404NOTFOUND)
   }
+  Set tSC = ##class(ZPM.Owner).IsOwner(pkg)
+  If ($$$ISERR(tSC)) {
+    Return ..ReportHttpStatusCode(..#HTTP403FORBIDDEN, tSC)
+  }
   If (pPackage.UpLink'="") {
     // only directly published package could be deleted
     Return ..ReportHttpStatusCode(..#HTTP400BADREQUEST)
   }
-  Return pPackage.%DeleteId(pPackage.%Id())
+  Return ##class(ZPM.Package).DeleteExistingPackages(pkg, version, 1)
 }
 
 ClassMethod PublishPackage() As %Status
 {
-  try {
-    If ($Username="UnknownUser") {
-      Return ..ReportHttpStatusCode(..#HTTP401UNAUTHORIZED)
-    }
-    If (%request.ContentType '= ..#CONTENTTYPEJSON) {
-      Return ..ReportHttpStatusCode(..#HTTP400BADREQUEST)
-    }
-    
+  Try {
+
     Set name = %request.Content.%Get("name")
     Set version = %request.Content.%Get("version")
     Set deployed = %request.Content.%Get("deployed")
     Set platformVersion = %request.Content.%Get("platform_version")
 
+    Set tSC = ##class(ZPM.Owner).IsAuth()
+    If ($$$ISERR(tSC)) {
+      Return ..ReportHttpStatusCode(..#HTTP401UNAUTHORIZED, tSC)
+    }
+    Set tSC = ##class(ZPM.Owner).IsOwner(name)
+    If ($$$ISERR(tSC)) {
+      Return ..ReportHttpStatusCode(..#HTTP403FORBIDDEN, tSC)
+    }
+    If (##class(ZPM.Package).IsDeleted(name, version)) {
+      Return ..ReportHttpStatusCode(..#HTTP403FORBIDDEN, $$$ERROR(5001,"This version was deleted, change version number"))
+    }
+
+    If (%request.ContentType '= ..#CONTENTTYPEJSON) {
+      Return ..ReportHttpStatusCode(..#HTTP400BADREQUEST)
+    }
+    
     If ##class(ZPM.Package).NameVersionExists(name, version, .id) {
       Set package = ##class(ZPM.Package).%OpenId(id) 
     }
@@ -230,6 +245,7 @@ ClassMethod PublishPackage() As %Status
       $$$ThrowOnError(package.packageFromBase64(%request.Content.%Get("package",,"stream")))
     }
     $$$ThrowOnError(package.%Save())
+    Do ##class(ZPM.Owner).SaveOwner(package.name, package.version)
     Return ..Package(package.name, package.version)
   } catch ex {
     Do ex.Log()