Merge branch 'user-methods' into 'master'

User methods

See merge request joinimpact/api!87

Author: oatmilkcat

internal/core/handlers/users/handlers.go

@@ -1 +1,39 @@
 package users
+
+import (
+	"net/http"
+
+	"github.com/joinimpact/api/internal/users"
+	"github.com/joinimpact/api/pkg/idctx"
+	"github.com/joinimpact/api/pkg/resp"
+)
+
+// DeletePost deletes a user by ID.
+func DeletePost(usersService users.Service) http.HandlerFunc {
+	type response struct {
+		Success bool `json:"success"`
+	}
+	return func(w http.ResponseWriter, r *http.Request) {
+		ctx := r.Context()
+
+		userID, err := idctx.Get(r, "userID")
+		if err != nil {
+			return
+		}
+
+		err = usersService.DeleteUser(ctx, userID)
+		if err != nil {
+			switch err.(type) {
+			case *users.ErrUserNotFound:
+				resp.NotFound(w, r, resp.Error(404, err.Error()))
+			case *users.ErrServerError:
+				resp.ServerError(w, r, resp.Error(500, err.Error()))
+			default:
+				resp.ServerError(w, r, resp.UnknownError)
+			}
+			return
+		}
+
+		resp.OK(w, r, response{true})
+	}
+}

internal/core/router.go

@@ -65,6 +65,7 @@ func (app *App) Router() *chi.Mux {
 				r.Use(scopes.Middleware(users.ScopeProviderUsers()))
 
 				r.Get("/", users.GetUserProfile(app.usersService))
+				r.With(permissions.Require(scopes.ScopeOwner)).Delete("/", users.DeletePost(app.usersService))
 				r.With(permissions.Require(scopes.ScopeOwner)).Patch("/", users.UpdateUserProfile(app.usersService))
 
 				r.Get("/tags", users.GetUserTags(app.usersService))
@@ -74,7 +75,7 @@ func (app *App) Router() *chi.Mux {
 				r.With(permissions.Require(scopes.ScopeOwner)).Post("/profile-picture", users.UploadProfilePicture(app.usersService))
 
 				r.With(permissions.Require(scopes.ScopeOwner)).Get("/organizations", organizations.GetUserOrganizations(app.organizationsService))
-				r.With(permissions.Require(scopes.ScopeOwner)).Get("/opportunities", opportunities.GetByVolunteer(app.opportunitiesService))
+				r.Get("/opportunities", opportunities.GetByVolunteer(app.opportunitiesService))
 				r.With(permissions.Require(scopes.ScopeOwner)).Get("/events", events.GetByVolunteer(app.eventsService))
 
 				r.Route("/conversations", func(r chi.Router) {

internal/users/service.go

@@ -1,6 +1,7 @@
 package users
 
 import (
+	"context"
 	"fmt"
 	"io"
 	"time"
@@ -33,6 +34,8 @@ type Service interface {
 	SetUserProfileField(userID int64, profileField models.UserProfileField) error
 	// UploadProfilePicture uploads a profile picture to the CDN and adds it to the user.
 	UploadProfilePicture(userID int64, fileReader io.Reader) (string, error)
+	// DeleteUser deletes a user's account by ID.
+	DeleteUser(ctx context.Context, userID int64) error
 }
 
 // service represents the internal implementation of the Service interface.
@@ -288,3 +291,12 @@ func (s *service) UploadProfilePicture(userID int64, fileReader io.Reader) (stri
 		ProfilePicture: url,
 	})
 }
+
+// DeleteUser deletes a user by ID.
+func (s *service) DeleteUser(ctx context.Context, userID int64) error {
+	if err := s.userRepository.DeleteByID(userID); err != nil {
+		return NewErrServerError()
+	}
+
+	return nil
+}