Merge pull request #69 from VladPetriv/refactor/replace-depracaded-function

refactor: remove deprecated function

Author: dstpierre

db.go

@@ -61,8 +61,7 @@ func (database *Database) add(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, _ := ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	var v interface{}
 	if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
@@ -92,8 +91,7 @@ func (database *Database) bulkAdd(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, _ := ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	var v []interface{}
 	if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
@@ -124,8 +122,7 @@ func (database *Database) list(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, _ := ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	result, err := backend.DB.ListDocuments(auth, conf.Name, col, params)
 	if err != nil {
@@ -177,11 +174,8 @@ func (database *Database) get(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	col, id := "", ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
-	id, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
+	id := getURLPart(r.URL.Path, 3)
 
 	result, err := backend.DB.GetDocumentByID(auth, conf.Name, col, id)
 	if err != nil {
@@ -225,10 +219,7 @@ func (database *Database) query(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var col string
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	result, err := backend.DB.QueryDocuments(auth, conf.Name, col, filter, params)
 	if err != nil {
@@ -246,10 +237,7 @@ func (database *Database) getByIds(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	col := ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	var ids []string
 	if err := parseBody(r.Body, &ids); err != nil {
@@ -278,11 +266,8 @@ func (database *Database) update(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	col, id := "", ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
-	id, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
+	id := getURLPart(r.URL.Path, 3)
 
 	var v interface{}
 	if err := json.NewDecoder(r.Body).Decode(&v); err != nil {
@@ -312,10 +297,7 @@ func (database *Database) bulkUpdate(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	var col string
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
 
 	var v struct {
 		UpdateFields map[string]any  `json:"update"`
@@ -376,11 +358,8 @@ func (database *Database) del(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	col, id := "", ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	col, r.URL.Path = ShiftPath(r.URL.Path)
-	id, r.URL.Path = ShiftPath(r.URL.Path)
+	col := getURLPart(r.URL.Path, 2)
+	id := getURLPart(r.URL.Path, 3)
 
 	count, err := backend.DB.DeleteDocument(auth, conf.Name, col, id)
 	if err != nil {

form.go

@@ -15,10 +15,7 @@ func submitForm(w http.ResponseWriter, r *http.Request) {
 		return
 	}
 
-	form := ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	form, r.URL.Path = ShiftPath(r.URL.Path)
+	form := getURLPart(r.URL.Path, 2)
 
 	doc := make(map[string]interface{})
 

membership.go

@@ -197,10 +197,7 @@ func (m *membership) sudoGetTokenFromAccountID(w http.ResponseWriter, r *http.Re
 		return
 	}
 
-	id := ""
-
-	_, r.URL.Path = ShiftPath(r.URL.Path)
-	id, r.URL.Path = ShiftPath(r.URL.Path)
+	id := getURLPart(r.URL.Path, 2)
 
 	tok, err := backend.DB.GetFirstUserFromAccountID(conf.Name, id)
 	if err != nil {