Fix Messages

Author: AchoArnold

android/app/src/main/java/com/httpsms/MainActivity.kt

@@ -53,7 +53,6 @@ class MainActivity : AppCompatActivity() {
         Timber.d( "on activity resume")
         redirectToLogin()
         refreshToken(this)
-        requestPermissions(this)
     }
 
     private fun registerReceivers(context: Context) {

api/pkg/handlers/phone_handler.go

@@ -41,6 +41,7 @@ func NewPhoneHandler(
 func (h *PhoneHandler) RegisterRoutes(router fiber.Router) {
 	router.Get("/phones", h.Index)
 	router.Put("/phones", h.Upsert)
+	router.Delete("/phones/:phoneID", h.Delete)
 }
 
 // Index returns the phones of a user
@@ -130,3 +131,40 @@ func (h *PhoneHandler) Upsert(c *fiber.Ctx) error {
 
 	return h.responseOK(c, "phone updated successfully", phone)
 }
+
+// Delete a phone
+// @Summary      Delete Phone
+// @Description  Delete a phone that has been sored in the database
+// @Security	 ApiKeyAuth
+// @Tags         Phones
+// @Accept       json
+// @Produce      json
+// @Param 		 phoneID 	path		string 							true 	"ID of the phone"	default(32343a19-da5e-4b1b-a767-3298a73703ca)
+// @Success      204 		{object}
+// @Failure      400		{object}	responses.BadRequest
+// @Failure 	 401    	{object}	responses.Unauthorized
+// @Failure      422		{object}	responses.UnprocessableEntity
+// @Failure      500		{object}	responses.InternalServerError
+// @Router       /phones/{phoneID} [delete]
+func (h *PhoneHandler) Delete(c *fiber.Ctx) error {
+	ctx, span := h.tracer.StartFromFiberCtx(c)
+	defer span.End()
+
+	ctxLogger := h.tracer.CtxLogger(h.logger, span)
+
+	request := requests.PhoneDelete{PhoneID: c.Params("phoneID")}
+	if errors := h.validator.ValidateDelete(ctx, request); len(errors) != 0 {
+		msg := fmt.Sprintf("validation errors [%s], while deleting phone [%+#v]", spew.Sdump(errors), request)
+		ctxLogger.Warn(stacktrace.NewError(msg))
+		return h.responseUnprocessableEntity(c, errors, "validation errors while deleting phone")
+	}
+
+	err := h.service.Delete(ctx, h.userIDFomContext(c), request.PhoneIDUuid())
+	if err != nil {
+		msg := fmt.Sprintf("cannot delete phones with params [%+#v]", request)
+		ctxLogger.Error(stacktrace.Propagate(err, msg))
+		return h.responseInternalServerError(c)
+	}
+
+	return h.responseOK(c, "phone deleted successfully", nil)
+}

api/pkg/repositories/gorm_phone_repository.go

@@ -5,6 +5,8 @@ import (
 	"errors"
 	"fmt"
 
+	"github.com/google/uuid"
+
 	"github.com/NdoleStudio/http-sms-manager/pkg/entities"
 	"github.com/NdoleStudio/http-sms-manager/pkg/telemetry"
 	"github.com/palantir/stacktrace"
@@ -31,6 +33,23 @@ func NewGormPhoneRepository(
 	}
 }
 
+// Delete an entities.Phone
+func (repository *gormPhoneRepository) Delete(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) error {
+	ctx, span := repository.tracer.Start(ctx)
+	defer span.End()
+
+	err := repository.db.WithContext(ctx).
+		Where("user_id = ?", userID).
+		Where("id = ?", phoneID).
+		Delete(&entities.Phone{}).Error
+	if err != nil {
+		msg := fmt.Sprintf("cannot delete phone with ID [%s] and userID [%s]", phoneID, userID)
+		return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+	}
+
+	return nil
+}
+
 // Save a new entities.Phone
 func (repository *gormPhoneRepository) Save(ctx context.Context, phone *entities.Phone) error {
 	ctx, span := repository.tracer.Start(ctx)

api/pkg/repositories/phone_repository.go

@@ -3,6 +3,8 @@ package repositories
 import (
 	"context"
 
+	"github.com/google/uuid"
+
 	"github.com/NdoleStudio/http-sms-manager/pkg/entities"
 )
 
@@ -16,4 +18,7 @@ type PhoneRepository interface {
 
 	// Load a phone by user and phone number
 	Load(ctx context.Context, userID entities.UserID, phoneNumber string) (*entities.Phone, error)
+
+	// Delete an entities.Phone
+	Delete(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) error
 }

api/pkg/requests/phone_delete_request.go

@@ -0,0 +1,16 @@
+package requests
+
+import (
+	"github.com/google/uuid"
+)
+
+// PhoneDelete is the payload for deleting
+type PhoneDelete struct {
+	request
+	PhoneID string `json:"phoneID" swaggerignore:"true"` // used internally for validation
+}
+
+// PhoneIDUuid returns the phoneID as uuid.UUID
+func (input *PhoneDelete) PhoneIDUuid() uuid.UUID {
+	return uuid.MustParse(input.PhoneID)
+}

api/pkg/services/notification_service.go

@@ -67,7 +67,7 @@ func (service *NotificationService) MessageSent(ctx context.Context, params *Not
 		Token: *phone.FcmToken,
 	})
 	if err != nil {
-		msg := fmt.Sprintf("cannot send notification for user [%s] to phone [%s]", params.MessageID, phone.ID)
+		msg := fmt.Sprintf("cannot send notification for message [%s] to phone [%s]", params.MessageID, phone.ID)
 		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 

api/pkg/services/phone_service.go

@@ -71,6 +71,11 @@ func (service *PhoneService) Upsert(ctx context.Context, params PhoneUpsertParam
 		return service.createPhone(ctx, params)
 	}
 
+	if err != nil {
+		msg := fmt.Sprintf("cannot upsert phone with id [%s] and number [%s]", phone.ID, phone.PhoneNumber)
+		return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+	}
+
 	phone.FcmToken = &params.FcmToken
 	if err = service.repository.Save(ctx, phone); err != nil {
 		msg := fmt.Sprintf("cannot update phone with id [%s] and number [%s]", phone.ID, phone.PhoneNumber)
@@ -81,6 +86,24 @@ func (service *PhoneService) Upsert(ctx context.Context, params PhoneUpsertParam
 	return phone, nil
 }
 
+// Delete an entities.Phone
+func (service *PhoneService) Delete(ctx context.Context, userID entities.UserID, phoneID uuid.UUID) error {
+	ctx, span := service.tracer.Start(ctx)
+	defer span.End()
+
+	ctxLogger := service.tracer.CtxLogger(service.logger, span)
+
+	err := service.repository.Delete(ctx, userID, phoneID)
+	if err != nil {
+		msg := fmt.Sprintf("cannot delete phone with id [%s] and user id [%s]", phoneID, userID)
+		return service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+	}
+
+	ctxLogger.Info(fmt.Sprintf("deleted phone with id [%s] and user id [%s]", phoneID, userID))
+
+	return nil
+}
+
 func (service *PhoneService) createPhone(ctx context.Context, params PhoneUpsertParams) (*entities.Phone, error) {
 	ctx, span := service.tracer.Start(ctx)
 	defer span.End()

api/pkg/validators/phone_handler_validator.go

@@ -71,3 +71,18 @@ func (validator *PhoneHandlerValidator) ValidateUpsert(_ context.Context, reques
 
 	return v.ValidateStruct()
 }
+
+// ValidateDelete ValidateUpsert validates requests.PhoneDelete
+func (validator *PhoneHandlerValidator) ValidateDelete(_ context.Context, request requests.PhoneDelete) url.Values {
+	v := govalidator.New(govalidator.Options{
+		Data: &request,
+		Rules: govalidator.MapData{
+			"phoneID": []string{
+				"required",
+				"uuid",
+			},
+		},
+	})
+
+	return v.ValidateStruct()
+}