Remove phone upsert transaction

Author: AchoArnold

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

@@ -53,6 +53,7 @@ class MainActivity : AppCompatActivity() {
         Timber.d( "on activity resume")
         redirectToLogin()
         refreshToken(this)
+        requestPermissions(this)
     }
 
     private fun registerReceivers(context: Context) {
@@ -191,18 +192,20 @@ class MainActivity : AppCompatActivity() {
         if (ActivityCompat.checkSelfPermission(
                 this,
                 Manifest.permission.READ_SMS
-            ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
+            ) != PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission(
                 this,
                 READ_PHONE_NUMBERS
-            ) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(
+            ) != PackageManager.PERMISSION_GRANTED || ActivityCompat.checkSelfPermission(
                 this,
                 Manifest.permission.READ_PHONE_STATE
             ) != PackageManager.PERMISSION_GRANTED
         ) {
+            Timber.d("cannot get owner because permissions are not granted")
             return Settings.getOwnerOrDefault(this)
         }
 
         if (telephonyManager.line1Number != null) {
+            Timber.d("line 1 number fetched [${telephonyManager.line1Number}]")
             Settings.setOwnerAsync(context, telephonyManager.line1Number)
         }
 
@@ -214,11 +217,10 @@ class MainActivity : AppCompatActivity() {
             return
         }
 
-        Timber.e("requesting permissions")
-
+        Timber.d("requesting permissions")
         val requestPermissionLauncher = registerForActivityResult(ActivityResultContracts.RequestMultiplePermissions()) { permissions ->
             permissions.entries.forEach {
-                Timber.e("${it.key} = ${it.value}")
+                Timber.d("${it.key} = ${it.value}")
                 setOwner(getPhoneNumber(context))
             }
         }
@@ -233,6 +235,6 @@ class MainActivity : AppCompatActivity() {
             )
         )
 
-        Timber.e("creating luncher")
+        Timber.d("creating permissions launcher")
     }
 }

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

@@ -137,17 +137,6 @@ object Settings {
             .apply()
     }
 
-    fun getReceiverRegistered(context: Context): Boolean{
-        Timber.d(Settings::getReceiverRegistered.name)
-
-        val receiverRegistered = PreferenceManager
-            .getDefaultSharedPreferences(context)
-            .getBoolean(this.SETTINGS_RECEIVER_REGISTERED,false)
-
-        Timber.d("SETTINGS_RECEIVER_REGISTERED: [$receiverRegistered]")
-        return receiverRegistered
-    }
-
     fun setReceiverRegistered(context: Context, registered: Boolean) {
         Timber.d(Settings::setReceiverRegistered.name)
 

api/pkg/repositories/gorm_phone_repository.go

@@ -7,7 +7,6 @@ import (
 
 	"github.com/NdoleStudio/http-sms-manager/pkg/entities"
 	"github.com/NdoleStudio/http-sms-manager/pkg/telemetry"
-	"github.com/cockroachdb/cockroach-go/v2/crdb/crdbgorm"
 	"github.com/palantir/stacktrace"
 	"gorm.io/gorm"
 )
@@ -32,37 +31,13 @@ func NewGormPhoneRepository(
 	}
 }
 
-func (repository *gormPhoneRepository) Upsert(ctx context.Context, phone *entities.Phone) error {
+// Save a new entities.Phone
+func (repository *gormPhoneRepository) Save(ctx context.Context, phone *entities.Phone) error {
 	ctx, span := repository.tracer.Start(ctx)
 	defer span.End()
 
-	err := crdbgorm.ExecuteTx(ctx, repository.db, nil, func(tx *gorm.DB) error {
-		existingPhone := new(entities.Phone)
-
-		err := tx.WithContext(ctx).Model(&phone).
-			Where("user_id = ?", phone.UserID).
-			Where("phone_number = ?", phone.PhoneNumber).
-			First(existingPhone).
-			Error
-
-		if err == nil {
-			existingPhone.FcmToken = phone.FcmToken
-			if err = tx.Save(existingPhone).Error; err != nil {
-				return stacktrace.Propagate(err, fmt.Sprintf("cannot update exiting phone [%s]", existingPhone.ID))
-			}
-			*phone = *existingPhone
-			return nil
-		}
-
-		if !errors.Is(err, gorm.ErrRecordNotFound) {
-			msg := fmt.Sprintf("cannot find phone with user_Id [%s] and phone_number [%s]", phone.UserID, phone.PhoneNumber)
-			return stacktrace.Propagate(err, msg)
-		}
-
-		return tx.Create(phone).Error
-	})
-	if err != nil {
-		msg := fmt.Sprintf("cannot upsert phone with params [%+#v]", err)
+	if err := repository.db.WithContext(ctx).Save(phone).Error; err != nil {
+		msg := fmt.Sprintf("cannot save phone with ID [%s]", phone.ID)
 		return repository.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 

api/pkg/repositories/phone_repository.go

@@ -8,8 +8,8 @@ import (
 
 // PhoneRepository loads and persists an entities.Phone
 type PhoneRepository interface {
-	// Upsert a new entities.Phone
-	Upsert(ctx context.Context, phone *entities.Phone) error
+	// Save Upsert a new entities.Phone
+	Save(ctx context.Context, phone *entities.Phone) error
 
 	// Index entities.Phone of a user
 	Index(ctx context.Context, userID entities.UserID, params IndexParams) (*[]entities.Phone, error)

api/pkg/services/phone_service.go

@@ -5,9 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"github.com/nyaruka/phonenumbers"
-
 	"github.com/google/uuid"
+	"github.com/nyaruka/phonenumbers"
 
 	"github.com/NdoleStudio/http-sms-manager/pkg/repositories"
 	"github.com/palantir/stacktrace"
@@ -67,6 +66,25 @@ func (service *PhoneService) Upsert(ctx context.Context, params PhoneUpsertParam
 
 	ctxLogger := service.tracer.CtxLogger(service.logger, span)
 
+	phone, err := service.repository.Load(ctx, params.UserID, phonenumbers.Format(&params.PhoneNumber, phonenumbers.E164))
+	if stacktrace.GetCode(err) == repositories.ErrCodeNotFound {
+		return service.createPhone(ctx, params)
+	}
+
+	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)
+		return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
+	}
+
+	ctxLogger.Info(fmt.Sprintf("phone saved with id [%s] in the userRepository", phone.ID))
+	return phone, nil
+}
+
+func (service *PhoneService) createPhone(ctx context.Context, params PhoneUpsertParams) (*entities.Phone, error) {
+	ctx, span := service.tracer.Start(ctx)
+	defer span.End()
+
 	phone := &entities.Phone{
 		ID:          uuid.New(),
 		UserID:      params.UserID,
@@ -76,11 +94,10 @@ func (service *PhoneService) Upsert(ctx context.Context, params PhoneUpsertParam
 		UpdatedAt:   time.Now().UTC(),
 	}
 
-	if err := service.repository.Upsert(ctx, phone); err != nil {
-		msg := fmt.Sprintf("cannot save phone with id [%s]", phone.ID)
+	if err := service.repository.Save(ctx, phone); err != nil {
+		msg := fmt.Sprintf("cannot create phone with id [%s] and number [%s]", phone.ID, phone.PhoneNumber)
 		return nil, service.tracer.WrapErrorSpan(span, stacktrace.Propagate(err, msg))
 	}
 
-	ctxLogger.Info(fmt.Sprintf("phone saved with id [%s] in the userRepository", phone.ID))
 	return phone, nil
 }