fix: field tags

Author: trakhimenok

botsfwmodels/base_data.go

@@ -8,27 +8,33 @@ import (
 // BotBaseData holds properties common to all bot entities
 type BotBaseData struct {
 	//user.OwnedByUserWithID
-	AppUserID string // intentionally indexed & do NOT omitempty (so we can find records with empty AppUserID)
+	AppUserID string `json:"appUserID" dalgo:"appUserID" firestore:"appUserID"` // intentionally indexed & do NOT omitempty (so we can find records with empty AppUserID)
 
 	// AppUserIntID is a strongly typed ID of the user
 	// Deprecated: use AppUserID instead, remove once all bots are migrated
 	//AppUserIntID int64 `json:",omitempty" datastore:",omitempty" firestore:",omitempty"`
 
-	DtCreated time.Time `json:",omitempty" datastore:",omitempty" firestore:",omitempty"`
-	DtUpdated time.Time `json:",omitempty" datastore:",omitempty" firestore:",omitempty"`
+	DtCreated time.Time `json:"dtCreated" dalgo:"dtCreated" datastore:"dtCreated" firestore:"dtCreated"`
+	DtUpdated time.Time `json:"dtUpdated" dalgo:"dtUpdated" datastore:"dtUpdated" firestore:"dtUpdated"`
 
 	// AccessGranted indicates if access to the bot has been granted
-	AccessGranted bool
+	AccessGranted bool `json:"isAccessGranted" dalgo:"isAccessGranted" datastore:"isAccessGranted" firestore:"isAccessGranted"`
 }
 
 // Validate returns error if data is invalid
 func (e *BotBaseData) Validate() error {
+	if e.AppUserID == "" {
+		return validation.NewErrRecordIsMissingRequiredField("AppUserID")
+	}
+	if e.DtCreated.IsZero() {
+		return validation.NewErrRecordIsMissingRequiredField("DtCreated")
+	}
+	if e.DtUpdated.IsZero() {
+		return validation.NewErrRecordIsMissingRequiredField("dtUpdated")
+	}
 	if e.DtUpdated.Before(e.DtCreated) {
-		return validation.NewErrBadRecordFieldValue("DtUpdated", "DtUpdated is before DtCreated")
+		return validation.NewErrBadRecordFieldValue("dtUpdated", "is before dtCreated")
 	}
-	//if e.AppUserID != "" && e.AppUserIntID != 0 && strconv.FormatInt(e.AppUserIntID, 10) != e.AppUserID {
-	//	return validation.NewErrBadRecordFieldValue("AppUserIntID", "does not match AppUserID")
-	//}
 	return nil
 }
 

botsfwmodels/bot_user_data.go

@@ -7,14 +7,14 @@ type BotUserBaseData struct {
 	BotBaseData
 	//user.LastLogin
 
-	// FirstName is first name of a user
-	FirstName string `json:",omitempty" dalgo:",omitempty,noindex"`
+	// FirstName is the first name of a user
+	FirstName string `json:"firstName,omitempty" firestore:"firstName,omitempty,noindex" dalgo:"firstName,omitempty,noindex"`
 
-	// LastName is last name of a user
-	LastName string `json:",omitempty" dalgo:",omitempty,noindex"`
+	// LastName is the last name of a user
+	LastName string `json:"lastName,omitempty" firestore:"lastName,omitempty,noindex" dalgo:"lastName,omitempty,noindex"`
 
 	// UserName is login ID of a user
-	UserName string `json:",omitempty" dalgo:",omitempty,noindex"`
+	UserName string `json:"userName,omitempty" firestore:"userName,omitempty,noindex" dalgo:"userName,omitempty,noindex"`
 }
 
 // BaseData returns base data of a user that should be included in all structs that implement BotUserData

botsfwmodels/chat_base_data_test.go

@@ -10,12 +10,12 @@ func TestBotChatEntity_PopStepsFromAwaitingReplyUpToSpecificParent(t *testing.T)
 	chatEntity.AwaitingReplyTo = "step1/step2/step3"
 	chatEntity.PopStepsFromAwaitingReplyUpToSpecificParent("step2")
 	if chatEntity.AwaitingReplyTo != "step1/step2" {
-		t.Errorf("Failed to remove last step3. AwaitingReplyTo: " + chatEntity.AwaitingReplyTo)
+		t.Errorf("Failed to remove last step3. AwaitingReplyTo: %s", chatEntity.AwaitingReplyTo)
 	}
 
 	chatEntity.AwaitingReplyTo = "step1/step2"
 	chatEntity.PopStepsFromAwaitingReplyUpToSpecificParent("step2")
 	if chatEntity.AwaitingReplyTo != "step1/step2" {
-		t.Errorf("Failed to remove last step3. AwaitingReplyTo: " + chatEntity.AwaitingReplyTo)
+		t.Errorf("Failed to remove last step3. AwaitingReplyTo: %s", chatEntity.AwaitingReplyTo)
 	}
 }