update: use Upsert instead of Get/Insert approach, use helper default…

… zk date for clear code
rarimo · Dec 13, 2024 · f117000 · f117000
1 parent d6ae94d
commit f117000
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 42 deletions.
diff --git a/internal/service/handlers/get_proof_parameters.go b/internal/service/handlers/get_proof_parameters.go
@@ -83,22 +83,12 @@ func GetProofParameters(w http.ResponseWriter, r *http.Request) {
 		TimestampUpperBound:       TimestampUpperBound,
 	}
 
-	existingUser, err := VerifyUsersQ(r).WhereHashID(user.UserIDHash).Get()
+	dbUser, err := VerifyUsersQ(r).Upsert(user)
 	if err != nil {
-		Log(r).WithError(err).Errorf("failed to query user with userID [%s]", user.UserIDHash)
-		ape.RenderErr(w, problems.InternalError())
-		return
-	}
-	if existingUser != nil {
-		ape.Render(w, responses.NewProofParametersResponse(*existingUser, proofParameters))
-		return
-	}
-
-	if err = VerifyUsersQ(r).Insert(user); err != nil {
-		Log(r).WithError(err).Errorf("failed to insert user with userID [%s]", user.UserIDHash)
+		Log(r).WithError(err).WithField("user", user).Errorf("failed to upsert user with userID [%s]", user.UserIDHash)
 		ape.RenderErr(w, problems.InternalError())
 		return
 	}
 
-	ape.Render(w, responses.NewProofParametersResponse(*user, proofParameters))
+	ape.Render(w, responses.NewProofParametersResponse(dbUser, proofParameters))
 }
diff --git a/internal/service/handlers/proof_params.go b/internal/service/handlers/proof_params.go
@@ -43,7 +43,7 @@ func GetProofParamsById(w http.ResponseWriter, r *http.Request) {
 			Nationality:          existingUser.Nationality,
 			SexEnable:            existingUser.SexEnable,
 			NationalityEnable:    existingUser.NationalityEnable,
-			ExpirationLowerBound: existingUser.ExpirationLowerBound != helpers.DefaultDateHex, // If there is non-default value, selector should be enabled
+			ExpirationLowerBound: !helpers.IsDefaultZKDate(existingUser.ExpirationLowerBound), // If there is non-default value, selector should be enabled
 		})
 		callbackURL = fmt.Sprintf("%s/integrations/verificator-svc/public/callback/%s", Callback(r).URL, userIDHash)
 	)

diff --git a/internal/service/handlers/proof_params_light.go b/internal/service/handlers/proof_params_light.go
@@ -43,7 +43,7 @@ func GetProofParamsLightById(w http.ResponseWriter, r *http.Request) {
 			Nationality:          existingUser.Nationality,
 			SexEnable:            existingUser.SexEnable,
 			NationalityEnable:    existingUser.NationalityEnable,
-			ExpirationLowerBound: existingUser.ExpirationLowerBound != helpers.DefaultDateHex, // If there is non-default value, selector should be enabled
+			ExpirationLowerBound: !helpers.IsDefaultZKDate(existingUser.ExpirationLowerBound), // If there is non-default value, selector should be enabled
 		})
 		callbackURL = fmt.Sprintf("%s/integrations/verificator-svc/light/public/callback-sign/%s", Callback(r).URL, userIDHash)
 	)

diff --git a/internal/service/handlers/verification_link.go b/internal/service/handlers/verification_link.go
@@ -64,23 +64,12 @@ func VerificationLink(w http.ResponseWriter, r *http.Request) {
 		user.ExpirationLowerBound = helpers.GetExpirationLowerBound(*req.Data.Attributes.ExpirationLowerBound)
 	}
 
-	existingUser, err := VerifyUsersQ(r).WhereHashID(user.UserIDHash).Get()
+	dbUser, err := VerifyUsersQ(r).Upsert(user)
 	if err != nil {
-		Log(r).WithError(err).Errorf("failed to query user with userID [%s]", user.UserIDHash)
+		Log(r).WithError(err).WithField("user", user).Errorf("failed to upsert user with userID [%s]", user.UserIDHash)
 		ape.RenderErr(w, problems.InternalError())
 		return
 	}
-	if existingUser != nil {
-		ape.Render(w, responses.NewVerificationLinkResponse(*existingUser, Callback(r).URL))
-		return
-	}
-
-	if err = VerifyUsersQ(r).Insert(user); err != nil {
-		Log(r).WithError(err).Errorf("failed to insert user with userID [%s]", user.UserIDHash)
-		ape.RenderErr(w, problems.InternalError())
-		return
-	}
-
-	ape.Render(w, responses.NewVerificationLinkResponse(*user, Callback(r).URL))
 
+	ape.Render(w, responses.NewVerificationLinkResponse(dbUser, Callback(r).URL))
 }
diff --git a/internal/service/handlers/verification_link_light.go b/internal/service/handlers/verification_link_light.go
@@ -60,23 +60,13 @@ func VerificationLinkLight(w http.ResponseWriter, r *http.Request) {
 		user.ExpirationLowerBound = helpers.GetExpirationLowerBound(*req.Data.Attributes.ExpirationLowerBound)
 	}
 
-	existingUser, err := VerifyUsersQ(r).WhereHashID(user.UserIDHash).Get()
+	dbUser, err := VerifyUsersQ(r).Upsert(user)
 	if err != nil {
-		Log(r).WithError(err).Errorf("failed to query user with userID [%s]", user.UserIDHash)
-		ape.RenderErr(w, problems.InternalError())
-		return
-	}
-	if existingUser != nil {
-		ape.Render(w, responses.NewVerificationLinkLightResponse(*existingUser, Callback(r).URL))
-		return
-	}
-
-	if err = VerifyUsersQ(r).Insert(user); err != nil {
-		Log(r).WithError(err).Errorf("failed to insert user with userID [%s]", user.UserIDHash)
+		Log(r).WithError(err).WithField("user", user).Errorf("failed to upsert user with userID [%s]", user.UserIDHash)
 		ape.RenderErr(w, problems.InternalError())
 		return
 	}
 
-	ape.Render(w, responses.NewVerificationLinkLightResponse(*user, Callback(r).URL))
+	ape.Render(w, responses.NewVerificationLinkLightResponse(dbUser, Callback(r).URL))
 
 }