Split Create User (#50502)

* Split Create User * Use new create user and User from package user * Add service to wire * Making create user work * Replace user from user pkg * One more * Move Insert to orguser Service/Store * Remove unnecessary conversion * Cleaunp * Fix Get User and add fakes * Fixing get org id for user logic, adding fakes and other adjustments * Add some tests for ourguser service and store * Fix insert org logic * Add comment about deprecation * Fix after merge with main * Move orguser service/store to org service/store * Remove orguser from wire * Unimplement new Create user and use User from pkg user * Fix wire generation * Fix lint * Fix lint - use only User and CrateUserCommand from user pkg * Remove User and CreateUserCommand from models * Fix lint 2
2022-06-28 14:32:25 +02:00
parent 2429fe1c70
commit 6c43eb0b4d
105 changed files with 1524 additions and 701 deletions
@@ -0,0 +1,73 @@
+package orgimpl
+
+import (
+	"context"
+	"testing"
+	"time"
+
+	"github.com/grafana/grafana/pkg/services/org"
+	"github.com/grafana/grafana/pkg/services/sqlstore"
+	"github.com/stretchr/testify/require"
+)
+
+func TestIntegrationOrgDataAccess(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	ss := sqlstore.InitTestDB(t)
+	orgStore := sqlStore{
+		db:      ss,
+		dialect: ss.GetDialect(),
+	}
+
+	t.Run("org not found", func(t *testing.T) {
+		_, err := orgStore.Get(context.Background(), 1)
+		require.Error(t, err, org.ErrOrgNotFound)
+	})
+
+	t.Run("org inserted", func(t *testing.T) {
+		_, err := orgStore.Insert(context.Background(), &org.Org{
+			Version: 1,
+			Name:    "test1",
+			Created: time.Now(),
+			Updated: time.Now(),
+		})
+		require.NoError(t, err)
+	})
+
+	t.Run("org inserted with next available org ID", func(t *testing.T) {
+		orgID, err := orgStore.Insert(context.Background(), &org.Org{
+			ID:      55,
+			Version: 1,
+			Name:    "test2",
+			Created: time.Now(),
+			Updated: time.Now(),
+		})
+		require.NoError(t, err)
+		_, err = orgStore.Get(context.Background(), orgID)
+		require.NoError(t, err)
+	})
+}
+
+func TestIntegrationOrgUserDataAccess(t *testing.T) {
+	if testing.Short() {
+		t.Skip("skipping integration test")
+	}
+
+	ss := sqlstore.InitTestDB(t)
+	orgUserStore := sqlStore{
+		db: ss,
+	}
+
+	t.Run("org user inserted", func(t *testing.T) {
+		_, err := orgUserStore.InsertUser(context.Background(), &org.OrgUser{
+			ID:      1,
+			OrgID:   1,
+			UserID:  1,
+			Created: time.Now(),
+			Updated: time.Now(),
+		})
+		require.NoError(t, err)
+	})
+}