Muttersprache koppeln und russischen A1-Kurs ergänzen
GUI und neue Erklärungen verwenden gemeinsam native_language. Deutsch und Russisch sind die beiden Muttersprachen; Englisch bleibt die Lernsprache. Kompatibilitätsfelder werden atomar gekoppelt, widersprüchliche Eingaben abgewiesen und bestehende Profile sowie eingefrorene Inhalte erhalten. Ergänzt vollständige russische GUI-Kataloge und 840 geprüfte Aufgabenansichten in sieben Modulen einschließlich A1-Test, mit getrennten Sprachrollen für Ausgangs- und Lernmaterial. Äquivalente Ansichten teilen ihre Nachweisidentität. Stabile API-Fehlercodes, neue deterministische Hilfen und Trainingsbegründungen berücksichtigen die Muttersprache. Dokumentiert das Sprachmodell in AGENTS.md. Validierung: Go-Race-Suite mit eigener lokaler PostgreSQL-Testdatenbank, go vet, Web-Build, Offline-Bank-/Variantenaudit, Diff-Prüfung sowie lokale Browser-Smokes für Sprachen, Kurs, Administration, Aussprache und Aufnahme. Keine Live-Anbieter, Produktionsprofile, Deployment-Schritte oder historischen Neubewertungen.
This commit is contained in:
@@ -98,15 +98,16 @@ func (s *PostgresStore) SaveGeneratedExercise(ctx context.Context, userID string
|
||||
return domain.Lesson{}, domain.Exercise{}, err
|
||||
}
|
||||
exercise := domain.Exercise{
|
||||
ID: NewID("exg"),
|
||||
LessonID: lesson.ID,
|
||||
TargetLanguage: targetLanguage,
|
||||
CEFRLevel: cefrLevel,
|
||||
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
|
||||
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
|
||||
TargetText: generated.ReferenceText,
|
||||
Difficulty: 1,
|
||||
Source: valueOr(generated.Source, "flowise"),
|
||||
ID: NewID("exg"),
|
||||
LessonID: lesson.ID,
|
||||
TargetLanguage: targetLanguage,
|
||||
CEFRLevel: cefrLevel,
|
||||
Type: valueOr(generated.ExerciseType, "repeat_sentence"),
|
||||
PromptText: valueOr(generated.DisplayPrompt, "Sprich den Satz klar nach."),
|
||||
InstructionLanguage: valueOr(generated.NativeLanguage, "de-DE"),
|
||||
TargetText: generated.ReferenceText,
|
||||
Difficulty: 1,
|
||||
Source: valueOr(generated.Source, "flowise"),
|
||||
}
|
||||
if strings.TrimSpace(exercise.TargetText) == "" {
|
||||
return domain.Lesson{}, domain.Exercise{}, errors.New("generated exercise reference_text is required")
|
||||
@@ -178,13 +179,16 @@ func (s *PostgresStore) DebugStatus(ctx context.Context) domain.DebugDBStatus {
|
||||
}
|
||||
|
||||
func (s *PostgresStore) CreateUser(ctx context.Context, email, passwordHash, uiLanguage string) (domain.User, error) {
|
||||
if !domain.SupportedNativeLanguage(uiLanguage) {
|
||||
return domain.User{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
user := domain.User{ID: NewID("usr"), Email: strings.ToLower(strings.TrimSpace(email)), UILanguage: uiLanguage}
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
INSERT INTO users (id, email, password_hash, ui_language)
|
||||
VALUES ($1, $2, $3, $4)
|
||||
RETURNING id, email, ui_language, instruction_language, role, created_at
|
||||
INSERT INTO users (id, email, password_hash, native_language, ui_language, instruction_language)
|
||||
VALUES ($1, $2, $3, $4, $4, $4)
|
||||
RETURNING id, email, native_language, ui_language, instruction_language, role, created_at
|
||||
`, user.ID, user.Email, passwordHash, uiLanguage)
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
return domain.User{}, err
|
||||
}
|
||||
return user, nil
|
||||
@@ -194,11 +198,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
|
||||
var user domain.User
|
||||
var hash string
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, email, password_hash, ui_language, instruction_language, role, created_at
|
||||
SELECT id, email, password_hash, native_language, ui_language, instruction_language, role, created_at
|
||||
FROM users
|
||||
WHERE email = $1
|
||||
`, strings.ToLower(strings.TrimSpace(email)))
|
||||
if err := row.Scan(&user.ID, &user.Email, &hash, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &hash, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.User{}, "", ErrNotFound
|
||||
}
|
||||
@@ -210,11 +214,11 @@ func (s *PostgresStore) GetPasswordHashByEmail(ctx context.Context, email string
|
||||
func (s *PostgresStore) GetUser(ctx context.Context, id string) (domain.User, error) {
|
||||
var user domain.User
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, email, ui_language, instruction_language, role, created_at
|
||||
SELECT id, email, native_language, ui_language, instruction_language, role, created_at
|
||||
FROM users
|
||||
WHERE id = $1
|
||||
`, id)
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if err := row.Scan(&user.ID, &user.Email, &user.NativeLanguage, &user.UILanguage, &user.InstructionLanguage, &user.Role, &user.CreatedAt); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.User{}, ErrNotFound
|
||||
}
|
||||
@@ -266,7 +270,7 @@ func (s *PostgresStore) GetPrimaryProfile(ctx context.Context, userID string) (d
|
||||
|
||||
func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguage, targetLanguage, cefrLevel string, dailyGoalMinutes int) (domain.LearnerProfile, error) {
|
||||
if uiLanguage != "" && !domain.SupportedUILanguage(uiLanguage) {
|
||||
return domain.LearnerProfile{}, errors.New("unsupported UI language")
|
||||
return domain.LearnerProfile{}, domain.ErrNativeLanguageUnsupported
|
||||
}
|
||||
tx, err := s.db.BeginTx(ctx, nil)
|
||||
if err != nil {
|
||||
@@ -302,7 +306,7 @@ func (s *PostgresStore) UpdatePreferences(ctx context.Context, userID, uiLanguag
|
||||
if err != nil {
|
||||
return profile, err
|
||||
}
|
||||
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,ui_language=CASE WHEN $3='' THEN ui_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
|
||||
_, err = tx.ExecContext(ctx, `UPDATE users SET active_profile_id=$2,native_language=CASE WHEN $3='' THEN native_language ELSE $3 END,ui_language=CASE WHEN $3='' THEN native_language ELSE $3 END,instruction_language=CASE WHEN $3='' THEN native_language ELSE $3 END WHERE id=$1`, userID, profile.ID, uiLanguage)
|
||||
if err != nil {
|
||||
return profile, err
|
||||
}
|
||||
@@ -414,11 +418,11 @@ func (s *PostgresStore) RecentPronunciationTexts(ctx context.Context, userID, la
|
||||
func (s *PostgresStore) GetExercise(ctx context.Context, id, userID string) (domain.Exercise, error) {
|
||||
var e domain.Exercise
|
||||
row := s.db.QueryRowContext(ctx, `
|
||||
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),'')
|
||||
SELECT id, lesson_id, target_language, cefr_level, type, prompt_text, target_text, difficulty, COALESCE(source, 'seed'), COALESCE((SELECT data->>'reason' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE((SELECT data->>'category' FROM pronunciation_plans WHERE exercise_id=exercises.id),''), COALESCE(NULLIF(agent_context_json->>'native_language',''),'de-DE')
|
||||
FROM exercises
|
||||
WHERE id = $1 AND (COALESCE(source, 'seed') = 'seed' OR created_by_user_id = $2)
|
||||
`, id, userID)
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory); err != nil {
|
||||
if err := row.Scan(&e.ID, &e.LessonID, &e.TargetLanguage, &e.CEFRLevel, &e.Type, &e.PromptText, &e.TargetText, &e.Difficulty, &e.Source, &e.TrainingReason, &e.TrainingCategory, &e.InstructionLanguage); err != nil {
|
||||
if errors.Is(err, sql.ErrNoRows) {
|
||||
return domain.Exercise{}, ErrNotFound
|
||||
}
|
||||
@@ -699,6 +703,19 @@ ALTER TABLE users ADD COLUMN IF NOT EXISTS instruction_language TEXT;
|
||||
UPDATE users SET instruction_language=ui_language WHERE instruction_language IS NULL;
|
||||
ALTER TABLE users ALTER COLUMN instruction_language SET DEFAULT 'de-DE';
|
||||
ALTER TABLE users ALTER COLUMN instruction_language SET NOT NULL;
|
||||
-- The product has two roles: native language (GUI and explanations together)
|
||||
-- and target language. Old unsupported GUI preferences become German once.
|
||||
ALTER TABLE users ADD COLUMN IF NOT EXISTS native_language TEXT;
|
||||
UPDATE users SET native_language=CASE WHEN ui_language IN ('de-DE','ru-RU') THEN ui_language ELSE 'de-DE' END WHERE native_language IS NULL;
|
||||
ALTER TABLE users ALTER COLUMN native_language SET DEFAULT 'de-DE';
|
||||
ALTER TABLE users ALTER COLUMN native_language SET NOT NULL;
|
||||
UPDATE users SET ui_language=native_language,instruction_language=native_language WHERE ui_language IS DISTINCT FROM native_language OR instruction_language IS DISTINCT FROM native_language;
|
||||
DO $$ BEGIN
|
||||
IF NOT EXISTS(SELECT 1 FROM pg_constraint WHERE conrelid='users'::regclass AND conname='users_native_language_coupled') THEN
|
||||
ALTER TABLE users ADD CONSTRAINT users_native_language_coupled CHECK(native_language IN ('de-DE','ru-RU') AND ui_language=native_language AND instruction_language=native_language);
|
||||
END IF;
|
||||
END $$;
|
||||
|
||||
|
||||
CREATE TABLE IF NOT EXISTS learner_profiles (
|
||||
id TEXT PRIMARY KEY,
|
||||
|
||||
Reference in New Issue
Block a user