Open platform to collect and prioritize feedback
Added a test for searching for German posts.
Matt Roberts871eabfc8367
diff --git a/app/pkg/dbx/setup.sql b/app/pkg/dbx/setup.sqlindex 71a21eeb8..592cfa75c 100644--- a/app/pkg/dbx/setup.sql+++ b/app/pkg/dbx/setup.sql@@ -41,4 +41,10 @@ VALUES ('Trial Expired', '[email protected]', 3, now(), 3, 1, 2, 'INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_at)VALUES (6, 3, 'facebook', 'FB3333', now());+INSERT INTO tenants (name, subdomain, created_at, cname, invitation, welcome_message, status, is_private, custom_css, logo_bkey, locale, is_email_auth_allowed, is_feed_enabled, prevent_indexing)+VALUES ('Demonstration German', 'german', now(), '', '', '', 1, false, '', '', 'de', true, true, false);+INSERT INTO users (name, email, tenant_id, created_at, role, status, avatar_type, avatar_bkey)+VALUES ('Jon Snow', '[email protected]', 4, now(), 3, 1, 2, '');+INSERT INTO user_providers (user_id, tenant_id, provider, provider_uid, created_at)+VALUES (7, 4, 'facebook', 'FB4444', now());diff --git a/app/services/sqlstore/postgres/post_test.go b/app/services/sqlstore/postgres/post_test.goindex 0287abbaa..be33db099 100644--- a/app/services/sqlstore/postgres/post_test.go+++ b/app/services/sqlstore/postgres/post_test.go@@ -60,6 +60,39 @@ func TestPostStorage_GetAll(t *testing.T) {Expect(search10.Result[0].Slug).Equals("add-twitter-integration")Expect(search0.Result).HasLen(0)}+func TestPostStorage_SearchGermanPosts(t *testing.T) {+ SetupDatabaseTest(t)+ defer TeardownDatabaseTest()++ now := time.Now()++ _, err := trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Wann kommt der \"Wächter\" für das neue Stunden- und Vertretungsplanmodul?', 'wann-kommt-der-wachter-fur-das-neue-stunden-und-vertretungsplanmodul', 1, 'Description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Neuer Stunden/ Vertretungsplanwächter', 'neuer-stunden-vertretungsplanwachter', 2, 'no description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Ungeklärte Vertretung wird zu Entfall', 'ungeklarte-vertretung-wird-zu-entfall', 3, 'some description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Vertretungsplan drucken', 'vertretungsplan-drucken', 4, 'another description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Vertretungsplanung Wochenansicht', 'vertretungsplanung-wochenansicht', 5, 'description here', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('VertretungsBoard', 'vertretungsboard', 6, 'board description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ _, err = trx.Execute("INSERT INTO posts (title, slug, number, description, created_at, tenant_id, user_id, status) VALUES ('Abwesenheiten Vertretungsplan', 'abwesenheiten-vertretungsplan', 7, 'final description', $1, $2, $3, 0)", now, germanTenant.ID, germanJonSnow.ID)+ Expect(err).IsNil()++ allPosts := &query.SearchPosts{Query: "Vertretung"}+ err = bus.Dispatch(germanTenantCtx, allPosts)+ Expect(err).IsNil()+ Expect(allPosts.Result).HasLen(3)++}func TestPostStorage_AddAndGet(t *testing.T) {SetupDatabaseTest(t)diff --git a/app/services/sqlstore/postgres/setup_test.go b/app/services/sqlstore/postgres/setup_test.goindex f138b71a9..76f1419ad 100644--- a/app/services/sqlstore/postgres/setup_test.go+++ b/app/services/sqlstore/postgres/setup_test.go@@ -23,17 +23,19 @@ var trx *dbx.Trxvar demoTenant *entity.Tenantvar avengersTenant *entity.Tenant-var gotTenant *entity.Tenant+var germanTenant *entity.Tenantvar jonSnow *entity.Uservar aryaStark *entity.Uservar sansaStark *entity.User+var germanJonSnow *entity.Uservar tonyStark *entity.Uservar demoTenantCtx context.Contextvar avengersTenantCtx context.Context-var gotTenantCtx context.Context+var germanTenantCtx context.Contextvar jonSnowCtx context.Context+var germanJonSnowCtx context.Contextvar aryaStarkCtx context.Contextvar sansaStarkCtx context.Contextvar tonyStarkCtx context.Context@@ -51,29 +53,33 @@ func SetupDatabaseTest(t *testing.T) context.Context {getDemo := &query.GetTenantByDomain{Domain: "demo"}getAvengers := &query.GetTenantByDomain{Domain: "avengers"}- getGameOfThrones := &query.GetTenantByDomain{Domain: "got"}- _ = bus.Dispatch(trxCtx, getDemo, getAvengers, getGameOfThrones)+ getGerman := &query.GetTenantByDomain{Domain: "german"}+ _ = bus.Dispatch(trxCtx, getDemo, getAvengers, getGerman)demoTenant = getDemo.ResultavengersTenant = getAvengers.Result- gotTenant = getGameOfThrones.Result+ germanTenant = getGerman.ResultdemoTenantCtx = withTenant(trxCtx, demoTenant)avengersTenantCtx = withTenant(trxCtx, avengersTenant)- gotTenantCtx = withTenant(trxCtx, gotTenant)+ germanTenantCtx = withTenant(trxCtx, germanTenant)getJonSnow := &query.GetUserByEmail{Email: "[email protected]"}+ getGermanJonSnow := &query.GetUserByEmail{Email: "[email protected]"}getAryaStark := &query.GetUserByEmail{Email: "[email protected]"}getSansaStark := &query.GetUserByEmail{Email: "[email protected]"}_ = bus.Dispatch(demoTenantCtx, getJonSnow, getSansaStark, getAryaStark)+ _ = bus.Dispatch(germanTenantCtx, getGermanJonSnow)jonSnow = getJonSnow.ResultaryaStark = getAryaStark.ResultsansaStark = getSansaStark.Result+ germanJonSnow = getGermanJonSnow.ResultgetTonyStark := &query.GetUserByEmail{Email: "[email protected]"}bus.MustDispatch(avengersTenantCtx, getTonyStark)tonyStark = getTonyStark.ResultjonSnowCtx = withUser(trxCtx, jonSnow)+ germanJonSnowCtx = withUser(trxCtx, germanJonSnow)aryaStarkCtx = withUser(trxCtx, aryaStark)sansaStarkCtx = withUser(trxCtx, sansaStark)tonyStarkCtx = withUser(trxCtx, tonyStark)