chore: changes from merge conflict

api/repo/chown.go

@@ -67,7 +67,7 @@ func ChownRepo(c *gin.Context) {
 	// update repo owner
 	r.SetUserID(u.GetID())
 
-	// send API call to updated the repo
+	// send API call to update the repo
 	err := database.FromContext(c).UpdateRepo(r)
 	if err != nil {
 		retErr := fmt.Errorf("unable to change owner of repo %s to %s: %w", r.GetFullName(), u.GetName(), err)

api/repo/create.go

@@ -100,7 +100,7 @@ func CreateRepo(c *gin.Context) {
 	// get repo information from the source
 	r, err := scm.FromContext(c).GetRepo(u, input)
 	if err != nil {
-		retErr := fmt.Errorf("unable to read repo %s from source: %w", input.GetFullName(), err)
+		retErr := fmt.Errorf("unable to retrieve repo info for %s from source: %w", r.GetFullName(), err)
 
 		util.HandleError(c, http.StatusBadRequest, retErr)
 
@@ -238,8 +238,9 @@ func CreateRepo(c *gin.Context) {
 		r.SetHash(dbRepo.GetHash())
 	}
 
-	// send API call to create the webhook
+	// check if we should create the webhook
 	if c.Value("webhookvalidation").(bool) {
+		// send API call to create the webhook
 		_, err = scm.FromContext(c).Enable(u, r.GetOrg(), r.GetName(), r.GetHash())
 		if err != nil {
 			retErr := fmt.Errorf("unable to create webhook for %s: %w", r.GetFullName(), err)

api/repo/delete.go

@@ -74,25 +74,36 @@ func DeleteRepo(c *gin.Context) {
 	if err != nil {
 		retErr := fmt.Errorf("unable to delete webhook for %s: %w", r.GetFullName(), err)
 
-		// set the status code based off the
-		code := http.StatusInternalServerError
 		if err.Error() == "Repo not found" {
-			code = http.StatusNotFound
+			util.HandleError(c, http.StatusNotFound, retErr)
+
+			return
 		}
 
-		util.HandleError(c, code, retErr)
+		util.HandleError(c, http.StatusInternalServerError, retErr)
 
 		return
 	}
 
-	err = database.FromContext(c).DeleteRepo(r)
+	// Mark the repo as inactive
+	r.SetActive(false)
+
+	err = database.FromContext(c).UpdateRepo(r)
 	if err != nil {
-		retErr := fmt.Errorf("unable to delete repo %s: %w", r.GetFullName(), err)
+		retErr := fmt.Errorf("unable to set repo %s to inactive: %w", r.GetFullName(), err)
 
 		util.HandleError(c, http.StatusInternalServerError, retErr)
 
 		return
 	}
 
-	c.JSON(http.StatusOK, fmt.Sprintf("repo %s deleted", r.GetFullName()))
+	// Comment out actual delete until delete mechanism is fleshed out
+	// err = database.FromContext(c).DeleteRepo(r.ID)
+	// if err != nil {
+	// 	retErr := fmt.Errorf("Error while deleting repo %s: %w", r.FullName, err)
+	// 	util.HandleError(c, http.StatusInternalServerError, retErr)
+	// 	return
+	// }
+
+	c.JSON(http.StatusOK, fmt.Sprintf("repo %s set to inactive", r.GetFullName()))
 }

api/repo/list.go

@@ -72,7 +72,7 @@ func ListRepos(c *gin.Context) {
 	// https://pkg.go.dev/github.com/sirupsen/logrus?tab=doc#Entry.WithFields
 	logrus.WithFields(logrus.Fields{
 		"user": u.GetName(),
-	}).Infof("reading repos for user %s", u.GetName())
+	}).Infof("listing repos for user %s", u.GetName())
 
 	// capture page query parameter if present
 	page, err := strconv.Atoi(c.DefaultQuery("page", "1"))

api/repo/repair.go

@@ -75,14 +75,26 @@ func RepairRepo(c *gin.Context) {
 		return
 	}
 
-	// send API call to create the webhook
-	_, err = scm.FromContext(c).Enable(u, r.GetOrg(), r.GetName(), r.GetHash())
-	if err != nil {
-		retErr := fmt.Errorf("unable to create webhook for %s: %w", r.GetFullName(), err)
+	// check if we should create the webhook
+	if c.Value("webhookvalidation").(bool) {
+		// send API call to create the webhook
+		_, err = scm.FromContext(c).Enable(u, r.GetOrg(), r.GetName(), r.GetHash())
+		if err != nil {
+			retErr := fmt.Errorf("unable to create webhook for %s: %w", r.GetFullName(), err)
 
-		util.HandleError(c, http.StatusInternalServerError, retErr)
+			switch err.Error() {
+			case "repo already enabled":
+				util.HandleError(c, http.StatusConflict, retErr)
+				return
+			case "repo not found":
+				util.HandleError(c, http.StatusNotFound, retErr)
+				return
+			}
 
-		return
+			util.HandleError(c, http.StatusInternalServerError, retErr)
+
+			return
+		}
 	}
 
 	// if the repo was previously inactive, mark it as active