Allow API creation of snapshots using package references

api/router.go

@@ -47,7 +47,7 @@ func Router(c *ctx.AptlyContext) http.Handler {
 
 	{
 		root.GET("/snapshots", apiSnapshotsList)
-		root.POST("/snapshots", apiSnapshotsCreateEmpty)
+		root.POST("/snapshots", apiSnapshotsCreate)
 		root.PUT("/snapshots/:name", apiSnapshotsUpdate)
 		root.GET("/snapshots/:name", apiSnapshotsShow)
 		root.GET("/snapshots/:name/packages", apiSnapshotsSearchPackages)

api/snapshot.go

@@ -87,7 +87,7 @@ func apiSnapshotsCreateFromMirror(c *gin.Context) {
 }
 
 // POST /api/snapshots/:name
-func apiSnapshotsCreateEmpty(c *gin.Context) {
+func apiSnapshotsCreate(c *gin.Context) {
 	var (
 		err       error
 		snapshot *deb.Snapshot
@@ -96,6 +96,8 @@ func apiSnapshotsCreateEmpty(c *gin.Context) {
 	var b struct {
 		Name                string `binding:"required"`
 		Description         string
+		SourceIDs           []string
+		PackageRefs         []string
 	}
 
 	if !c.Bind(&b) {
@@ -103,16 +105,38 @@ func apiSnapshotsCreateEmpty(c *gin.Context) {
 	}
 
 	if b.Description == "" {
-		b.Description = "Created as empty"
+		if len(b.SourceIDs) + len(b.PackageRefs) == 0 {
+			b.Description = "Created as empty"
+		}
 	}
 
 	snapshotCollection := context.CollectionFactory().SnapshotCollection()
 	snapshotCollection.Lock()
 	defer snapshotCollection.Unlock()
 
-	packageList := deb.NewPackageList()
+    sources := make([]*deb.Snapshot, len(b.SourceIDs))
 
-	snapshot = deb.NewSnapshotFromPackageList(b.Name, nil, packageList, b.Description)
+    for i := 0; i < len(b.SourceIDs); i++ {
+        sources[i], err = snapshotCollection.ByUUID(b.SourceIDs[i])
+        if err != nil {
+			c.Fail(404, err)
+			return
+        }
+
+        err = snapshotCollection.LoadComplete(sources[i])
+        if err != nil {
+			c.Fail(500, err)
+			return
+        }
+    }
+
+    packageRefs := make([][]byte, len(b.PackageRefs))
+	for i, ref := range b.PackageRefs {
+		packageRefs[i] = []byte(ref)
+	}
+
+	packageRefList := &deb.PackageRefList{packageRefs}
+	snapshot = deb.NewSnapshotFromRefList(b.Name, sources, packageRefList, b.Description)
 
 	err = snapshotCollection.Add(snapshot)
 	if err != nil {

system/t12_api/snapshots.py

@@ -20,6 +20,35 @@ class SnapshotsAPITestCreateShow(APITest):
         self.check_equal(self.get("/api/snapshots/" + self.random_name()).status_code, 404)
 
 
+class SnapshotsAPITestCreateFromRefs(APITest):
+    """
+    GET /api/snapshots/:name, POST /api/snapshots, GET /api/snapshots/:name/packages
+    """
+    def check(self):
+        snapshot_name = self.random_name()
+        snapshot_desc = {u'Description': u'fun snapshot',
+                         u'Name': snapshot_name,
+                         u'SourceIDs': ['123']}
+
+        resp = self.post("/api/snapshots", json=snapshot_desc)
+        self.check_equal(resp.status_code, 404)
+
+        resp = self.post("/api/snapshots", json={"Name": self.random_name()})
+        self.check_equal(resp.status_code, 201)
+        snapshot_desc['SourceIDs'] = [resp.json()["UUID"]]
+
+        snapshot = snapshot_desc.copy()
+        snapshot['PackageRefs'] = ["Pi386 libboost-program-options-dev 1.49.0.1 918d2f433384e378"]
+        resp = self.post("/api/snapshots", json=snapshot)
+        self.check_equal(resp.status_code, 201)
+        self.check_subset(snapshot_desc, resp.json())
+
+        self.check_subset(snapshot_desc, self.get("/api/snapshots/" + snapshot_name).json())
+        self.check_equal(self.get("/api/snapshots/" + snapshot_name).status_code, 200)
+
+        self.check_equal(self.get("/api/snapshots/" + self.random_name()).status_code, 404)
+
+
 class SnapshotsAPITestCreateFromRepo(APITest):
     """
     POST /api/repos, POST /api/repos/:name/snapshots, GET /api/snapshots/:name