Merge pull request #3 from gemsorg/delete_assignment

Delete assignment endpoint

Author: edshadi

pkg/api/assignmentdestroyer/assignmentfetcher/endpoint.go

@@ -0,0 +1,36 @@
+package assignmentdestroyer
+
+import (
+	"context"
+
+	"github.com/gemsorg/assignment/pkg/apierror"
+	"github.com/gemsorg/assignment/pkg/authentication"
+	"github.com/gemsorg/assignment/pkg/service"
+	"github.com/go-kit/kit/endpoint"
+)
+
+func makeAssignmentDestroyerEndpoint(svc service.AssignmentService) endpoint.Endpoint {
+	return func(ctx context.Context, request interface{}) (interface{}, error) {
+		data, _ := authentication.ParseAuthData(ctx)
+		svc.SetAuthData(data)
+		req := request.(AssignmentRequest)
+		p, err := svc.DeleteAssignment(req.WorkerID, req.JobID)
+		if err != nil {
+			return AssignmentResponse{p}, errorResponse(err)
+		}
+		return AssignmentResponse{p}, nil
+	}
+}
+
+func errorResponse(err error) *apierror.APIError {
+	return apierror.New(500, err.Error(), err)
+}
+
+type AssignmentRequest struct {
+	WorkerID uint64 `json:"worker_id"`
+	JobID    uint64 `json:"job_id"`
+}
+
+type AssignmentResponse struct {
+	Destroyed bool `json:"destroyed"`
+}

pkg/api/assignmentdestroyer/assignmentfetcher/transport.go

@@ -0,0 +1,34 @@
+package assignmentdestroyer
+
+import (
+	"context"
+	"encoding/json"
+	"net/http"
+
+	"github.com/gemsorg/assignment/pkg/apierror"
+	"github.com/gemsorg/assignment/pkg/service"
+	kithttp "github.com/go-kit/kit/transport/http"
+)
+
+func MakeHandler(s service.AssignmentService) http.Handler {
+	return kithttp.NewServer(
+		makeAssignmentDestroyerEndpoint(s),
+		decodeAssignmentDestroyerRequest,
+		encodeResponse,
+	)
+}
+
+func encodeResponse(ctx context.Context, w http.ResponseWriter, response interface{}) error {
+	w.Header().Set("Content-Type", "application/json; charset=utf-8")
+	return json.NewEncoder(w).Encode(response)
+}
+
+func decodeAssignmentDestroyerRequest(_ context.Context, r *http.Request) (interface{}, error) {
+	var a AssignmentRequest
+	decoder := json.NewDecoder(r.Body)
+	err := decoder.Decode(&a)
+	if err != nil {
+		return nil, apierror.New(500, err.Error(), err)
+	}
+	return a, nil
+}

pkg/datastore/assignment.go

@@ -18,6 +18,7 @@ type Storage interface {
 	GetSettings(jobID uint64) (*assignment.Settings, error)
 	GetWhitelist(jobID uint64, workerID uint64) (*whitelist.Whitelist, error)
 	WorkerAlreadyAssigned(jobID uint64, workerID uint64) (bool, error)
+	DeleteAssignment(workerID uint64, jobID uint64) (bool, error)
 }
 
 type AssignmentStore struct {
@@ -137,3 +138,18 @@ func (as *AssignmentStore) WorkerAlreadyAssigned(jobID uint64, workerID uint64)
 
 	return true, nil
 }
+
+func (as *AssignmentStore) DeleteAssignment(workerID uint64, jobID uint64) (bool, error) {
+	result, err := as.DB.Exec("DELETE FROM assignments WHERE worker_id = ? AND job_id = ?", workerID, jobID)
+	if err != nil {
+		return false, err
+	}
+
+	numAffected, err := result.RowsAffected()
+
+	if numAffected == 0 {
+		return false, AssignmentNotFound{workerID, jobID}
+	}
+
+	return true, nil
+}

pkg/datastore/errors.go

@@ -1,7 +1,18 @@
 package datastore
 
+import "fmt"
+
 type AlreadyAssigned struct{}
 
 func (err AlreadyAssigned) Error() string {
 	return "User is already assigned a task from this job"
 }
+
+type AssignmentNotFound struct {
+	WorkerID uint64
+	JobID    uint64
+}
+
+func (err AssignmentNotFound) Error() string {
+	return fmt.Sprintf("No Record found for worker_id: %d, job_id: %d", err.WorkerID, err.JobID)
+}

pkg/server/server.go

@@ -4,6 +4,7 @@ import (
 	"net/http"
 
 	"github.com/gemsorg/assignment/pkg/api/assignmentcreator"
+	assignmentdestroyer "github.com/gemsorg/assignment/pkg/api/assignmentdestroyer/assignmentfetcher"
 	"github.com/gemsorg/assignment/pkg/api/assignmentfetcher"
 
 	"github.com/gemsorg/assignment/pkg/authentication"
@@ -25,6 +26,7 @@ func New(
 	r.Handle("/assignments", assignmentfetcher.MakeAssignmentsFetcherHandler(s)).Methods("GET")
 	r.Handle("/assignments/{assignment_id}", assignmentfetcher.MakeAssignmentFetcherHandler(s)).Methods("GET")
 	r.Handle("/assignments", assignmentcreator.MakeHandler(s)).Methods("POST")
+	r.Handle("/assignments", assignmentdestroyer.MakeHandler(s)).Methods("DELETE")
 	r.Use(authentication.AuthMiddleware)
 	return withHandlers(r)
 }

pkg/service/service.go

@@ -14,6 +14,7 @@ type AssignmentService interface {
 	GetAssignment(id string) (*assignment.Assignment, error)
 	CreateAssignment(assignment.NewAssignment, *assignment.Settings) (*assignment.Assignment, error)
 	GetSettings(jobID uint64) (*assignment.Settings, error)
+	DeleteAssignment(workerID uint64, jobID uint64) (bool, error)
 }
 
 type service struct {
@@ -68,3 +69,7 @@ func (s *service) CreateAssignment(a assignment.NewAssignment, set *assignment.S
 func (s *service) GetSettings(jobID uint64) (*assignment.Settings, error) {
 	return s.store.GetSettings(jobID)
 }
+
+func (s *service) DeleteAssignment(workerID uint64, jobID uint64) (bool, error) {
+	return s.store.DeleteAssignment(workerID, jobID)
+}