fix: AddClientLanguage() sets preferred language if it is empty

trakhimenok · trakhimenok · commit 51b41a36b8a5 · 2024-08-21T06:56:12.000+01:00
diff --git a/botsfwmodels/chat_settings.go b/botsfwmodels/chat_settings.go
@@ -1,8 +1,8 @@
 package botsfwmodels
 
 type chatSettings struct {
-	PreferredLanguage string   `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"`
-	LanguageCodes     []string `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"` // UI languages
+	PreferredLanguage string   `dalgo:"preferredLanguage,noindex,omitempty" firestore:"preferredLanguage,omitempty"`
+	LanguageCodes     []string `dalgo:"languageCodes,noindex,omitempty" firestore:"languageCodes,omitempty"` // UI languages
 }
 
 // GetPreferredLanguage returns preferred language
@@ -26,5 +26,8 @@ func (e *chatSettings) AddClientLanguage(languageCode string) (changed bool) {
 		}
 	}
 	e.LanguageCodes = append(e.LanguageCodes, languageCode)
+	if e.PreferredLanguage == "" {
+		e.PreferredLanguage = languageCode
+	}
 	return false
 }
diff --git a/botsfwmodels/chat_state.go b/botsfwmodels/chat_state.go
@@ -7,8 +7,8 @@ import (
 )
 
 type chatState struct {
-	changed         bool
-	AwaitingReplyTo string `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"`
+	changed         bool   // TODO: consider replacing with dal.Record.MarkAsChanged()
+	AwaitingReplyTo string `dalgo:"awaitingReplyTo,noindex,omitempty" firestore:"awaitingReplyTo,omitempty"`
 }
 
 func (e *chatState) IsChanged() bool {

Original file line number	Diff line number	Diff line change
`@@ -1,8 +1,8 @@`
`1`	`1`	`package botsfwmodels`
`2`	`2`
`3`	`3`	`type chatSettings struct {`
`4`		- PreferredLanguage string `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"`
`5`		- LanguageCodes []string `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"` // UI languages
	`4`	+ PreferredLanguage string `dalgo:"preferredLanguage,noindex,omitempty" firestore:"preferredLanguage,omitempty"`
	`5`	+ LanguageCodes []string `dalgo:"languageCodes,noindex,omitempty" firestore:"languageCodes,omitempty"` // UI languages
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`// GetPreferredLanguage returns preferred language`
`@@ -26,5 +26,8 @@ func (e *chatSettings) AddClientLanguage(languageCode string) (changed bool) {`
`26`	`26`	`}`
`27`	`27`	`}`
`28`	`28`	`e.LanguageCodes = append(e.LanguageCodes, languageCode)`
	`29`	`+ if e.PreferredLanguage == "" {`
	`30`	`+ e.PreferredLanguage = languageCode`
	`31`	`+ }`
`29`	`32`	`return false`
`30`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,8 +7,8 @@ import (`
`7`	`7`	`)`
`8`	`8`
`9`	`9`	`type chatState struct {`
`10`		`- changed bool`
`11`		- AwaitingReplyTo string `dalgo:",noindex,omitempty" datastore:",noindex,omitempty" firestore:",omitempty"`
	`10`	`+ changed bool // TODO: consider replacing with dal.Record.MarkAsChanged()`
	`11`	+ AwaitingReplyTo string `dalgo:"awaitingReplyTo,noindex,omitempty" firestore:"awaitingReplyTo,omitempty"`
`12`	`12`	`}`
`13`	`13`
`14`	`14`	`func (e *chatState) IsChanged() bool {`