changing accession route for new records

controllers/accessionsController.go

@@ -2,6 +2,7 @@ package controllers
 
 import (
 	"fmt"
+	"log"
 	"net/http"
 	"strconv"
 	"time"
@@ -124,7 +125,7 @@ func NewAccession(c *gin.Context) {
 		return
 	}
 
-	resourceID, err := strconv.Atoi(c.Param("id"))
+	resourceID, err := strconv.Atoi(c.Query("resource_id"))
 	if err != nil {
 		c.JSON(http.StatusBadRequest, err.Error())
 		return
@@ -160,42 +161,26 @@ func CreateAccession(c *gin.Context) {
 		return
 	}
 
-	userId, err := getUserkey(c)
+	userID, err := getUserkey(c)
 	if err != nil {
 		c.JSON(http.StatusBadRequest, err.Error())
 		return
 	}
 
 	accession.CreatedAt = time.Now()
-	accession.CreatedBy = userId
+	accession.CreatedBy = userID
 	accession.UpdatedAt = time.Now()
-	accession.UpdatedBy = userId
-
-	c.JSON(200, accession)
-
-	/*
-
-		log.Println("Controller collection ID", accession.CollectionID)
-
-		userId, err := getUserkey(c)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, err.Error())
-			return
-		}
+	accession.UpdatedBy = userID
 
-		accession.CreatedAt = time.Now()
-		accession.CreatedBy = userId
-		accession.UpdatedAt = time.Now()
-		accession.UpdatedBy = userId
-
-		accessionID, err := database.InsertAccession(&accession)
-		if err != nil {
-			c.JSON(http.StatusBadRequest, err.Error())
-			return
-		}
+	log.Println("CONTROLLER BEFORE:", accession.CollectionID)
+	accessionID, err := database.InsertAccession(&accession)
+	if err != nil {
+		c.JSON(http.StatusBadRequest, err.Error())
+		return
+	}
+	log.Println("CONTROLLER AFTER:", accession.CollectionID)
 
-		c.Redirect(302, fmt.Sprintf("/accessions/%d/show", accessionID))
-	*/
+	c.Redirect(302, fmt.Sprintf("/accessions/%d/show", accessionID))
 
 }
 

database/accessions.go

@@ -1,6 +1,8 @@
 package database
 
 import (
+	"log"
+
 	"github.com/nyudlts/go-medialog/models"
 	"github.com/nyudlts/go-medialog/utils"
 	"gorm.io/gorm/clause"
@@ -40,9 +42,11 @@ func FindPaginatedAccessions(pagination utils.Pagination) ([]models.Accession, e
 }
 
 func InsertAccession(accession *models.Accession) (uint, error) {
+	log.Println("DATABASE BEFORE:", accession.CollectionID)
 	if err := db.Create(accession).Error; err != nil {
 		return 0, err
 	}
+	log.Println("DATABASE AFTER", accession.CollectionID)
 	return accession.ID, nil
 }
 

medialog.go

@@ -46,7 +46,7 @@ func main() {
 	router.SetTrustedProxies([]string{"127.0.0.1"})
 
 	//connect the database
-	if err := database.ConnectDatabase(filepath.Join("database", "medialog.db")); err != nil {
+	if err := database.ConnectDatabase(filepath.Join("database", "medialog-test.db")); err != nil {
 		os.Exit(2)
 	}
 

migration/migrate.go

@@ -264,7 +264,7 @@ func createAdminUser() {
 	hash := sha512.Sum512([]byte(password + user.Salt))
 	user.EncryptedPassword = hex.EncodeToString(hash[:])
 
-	if err := database.InsertUser(&user); err != nil {
+	if _, err := database.InsertUser(&user); err != nil {
 		panic(err)
 	}
 

routes/routes.go

@@ -16,7 +16,7 @@ func LoadRoutes(router *gin.Engine) {
 
 	//Accessions Group
 	accessionsRoutes := router.Group("/accessions")
-	accessionsRoutes.GET(":id/new", func(c *gin.Context) { controllers.NewAccession(c) })
+	accessionsRoutes.GET("new", func(c *gin.Context) { controllers.NewAccession(c) })
 	accessionsRoutes.POST("", func(c *gin.Context) { controllers.CreateAccession(c) })
 	accessionsRoutes.GET("", func(c *gin.Context) { controllers.GetAccessions(c) })
 	accessionsRoutes.GET(":id/show", func(c *gin.Context) { controllers.GetAccession(c) })

templates/accessions/accessions-new.html

@@ -18,10 +18,7 @@ <h5 class="card-title">Create an Accession</h5>
           <label for="accession_num">Accession Call Number</label>
           <input type="text" name="accession_num" id="accession_num" />
         </div>
-        <div class="form-group">
-          <label for="accession_num">Accession Call Number</label>
-          <input type="number" name="collection_id" id="collectionID" value="{{.resource.ID}}" />
-        </div>
+        <input type="hidden" name="collection_id" id="collection_id" value="{{ .resource.ID }}" />
         <input type="hidden" name="repository_id" id="repository_id" value="{{ .repository.ID }}">
         <input class="btn btn-primary" type="submit">
       </form>

templates/resources/resources-show.html

@@ -55,7 +55,7 @@ <h5 class="card-title">Accessions</h5>
             </tbody>
         </table>
         <div class="row">
-            <a href="/accessions/{{ .resource.ID }}/new" class="btn btn-primary">Add Accession</a>
+            <a href="/accessions/new?resource_id={{.resource.ID}}" class="btn btn-primary">Add Accession</a>
         </div>
     </div>
 </div>