Fix merge errors

opf · Jun 29, 2023 · 61b6bd0 · 61b6bd0
1 parent de7af3b
commit 61b6bd0
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 9 deletions.
diff --git a/components/paths/paths.go b/components/paths/paths.go
@@ -33,3 +33,7 @@ func WorkPackage(id uint64) string {
 func WorkPackages() string {
 	return Root() + "/work_packages"
 }
+
+func WorkPackageActivities(id uint64) string {
+	return WorkPackage(id) + "/activities"
+}
diff --git a/components/resources/users/functions.go b/components/resources/users/functions.go
@@ -22,9 +22,9 @@ func ByIds(ids []uint64) []*models.User {
 
 	requestUrl := usersPath
 
-	status, response := requests.Get(requestUrl, &query)
-	if !requests.IsSuccess(status) {
-		printer.ResponseError(status, response)
+	response, err := requests.Get(requestUrl, &query)
+	if err != nil {
+		printer.Error(err)
 	}
 
 	userCollection := parser.Parse[dtos.UserCollectionDto](response)

diff --git a/components/resources/work_packages/activities.go b/components/resources/work_packages/activities.go
@@ -1,20 +1,18 @@
 package work_packages
 
 import (
-	"path/filepath"
-	"strconv"
-
 	"github.com/opf/openproject-cli/components/parser"
+	"github.com/opf/openproject-cli/components/paths"
 	"github.com/opf/openproject-cli/components/printer"
 	"github.com/opf/openproject-cli/components/requests"
 	"github.com/opf/openproject-cli/dtos"
 	"github.com/opf/openproject-cli/models"
 )
 
 func Activities(id uint64) (activites []*models.Activity, err error) {
-	status, response := requests.Get(filepath.Join(workPackagesPath, strconv.FormatUint(id, 10), "activities"), nil)
-	if !requests.IsSuccess(status) {
-		printer.ResponseError(status, response)
+	response, err := requests.Get(paths.WorkPackageActivities(id), nil)
+	if err != nil {
+		printer.Error(err)
 	}
 
 	activitiesDto := parser.Parse[dtos.ActivityCollectionDto](response)