Fixed sort order for user projection. Moved run configurations to .run

Author: pdt256

.gitignore

@@ -1,4 +1,3 @@
-.idea/*
-!.idea/runConfigurations/
+.idea/
 *_gen.go
 statik/

.idea/runConfigurations/All_Unit_Tests.xml .run/All Unit Tests.run.xml

@@ -2,11 +2,11 @@
   <configuration default="false" name="All Unit Tests" type="GoTestRunConfiguration" factoryName="Go Test">
     <module name="goauth2" />
     <working_directory value="$PROJECT_DIR$" />
-    <framework value="gotest" />
     <kind value="DIRECTORY" />
     <package value="github.com/inklabs/goauth2" />
     <directory value="$PROJECT_DIR$/" />
     <filePath value="$PROJECT_DIR$/" />
+    <framework value="gotest" />
     <method v="2" />
   </configuration>
 </component>

.run/Run GoAuth2.run.xml

@@ -0,0 +1,12 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Run GoAuth2" type="GoApplicationRunConfiguration" factoryName="Go Application">
+    <module name="goauth2" />
+    <working_directory value="$PROJECT_DIR$" />
+    <parameters value="-port 8080" />
+    <kind value="PACKAGE" />
+    <package value="github.com/inklabs/goauth2/cmd/goauth2" />
+    <directory value="$PROJECT_DIR$" />
+    <filePath value="$PROJECT_DIR$/cmd/goauth2/main.go" />
+    <method v="2" />
+  </configuration>
+</component>

projection/users.go

@@ -68,6 +68,10 @@ func (a *Users) GetAll() []*user {
 	a.mu.RUnlock()
 
 	sort.SliceStable(users, func(i, j int) bool {
+		if users[i].CreateTimestamp == users[j].CreateTimestamp {
+			return users[i].UserID < users[j].UserID
+		}
+
 		return users[i].CreateTimestamp >= users[j].CreateTimestamp
 	})
 

projection/users_test.go

@@ -25,7 +25,7 @@ func TestUsers_Accept(t *testing.T) {
 	issueTime := time.Date(2020, 05, 11, 8, 0, 0, 0, time.UTC)
 	issueTime2 := time.Date(2020, 05, 12, 8, 0, 0, 0, time.UTC)
 
-	t.Run("can get all users ordered by creation timestamp", func(t *testing.T) {
+	t.Run("can get all users ordered by descending creation timestamp", func(t *testing.T) {
 		// Given
 		users := projection.NewUsers()
 		record1 := rangedbtest.DummyRecordFromEvent(&goauth2.UserWasOnBoarded{
@@ -53,6 +53,31 @@ func TestUsers_Accept(t *testing.T) {
 		assert.Equal(t, uint64(issueTime2.Unix()), actualUsers[0].CreateTimestamp)
 	})
 
+	t.Run("can get all users ordered by creation timestamp, then by ascending userID", func(t *testing.T) {
+		// Given
+		users := projection.NewUsers()
+		record1 := rangedbtest.DummyRecordFromEvent(&goauth2.UserWasOnBoarded{
+			UserID:       userID,
+			Username:     username,
+			PasswordHash: passwordHash,
+		})
+		record2 := rangedbtest.DummyRecordFromEvent(&goauth2.UserWasOnBoarded{
+			UserID:       userID2,
+			Username:     username2,
+			PasswordHash: passwordHash,
+		})
+		users.Accept(record2)
+		users.Accept(record1)
+
+		// When
+		actualUsers := users.GetAll()
+
+		// Then
+		assert.Len(t, actualUsers, 2)
+		assert.Equal(t, userID2, actualUsers[0].UserID)
+		assert.Equal(t, username2, actualUsers[0].Username)
+	})
+
 	t.Run("includes admin flag", func(t *testing.T) {
 		// Given
 		users := projection.NewUsers()

web/templates/add-user.gohtml

@@ -17,7 +17,7 @@
                         <div class="form-vertical">
                             <div class="form-group">
                                 <label class="form-label">Username
-                                    <input name="username" type="text" class="form-input" value="{{.Username}}">
+                                    <input name="username" type="text" class="form-input" value="{{.Username}}" autofocus>
                                 </label>
                             </div>
                             <div class="form-group">

web/templates/login.gohtml

@@ -20,7 +20,7 @@
                         <div class="form-vertical">
                             <div class="form-group">
                                 <label class="form-label">Username
-                                    <input name="username" type="text" class="form-input">
+                                    <input name="username" type="text" class="form-input" autofocus>
                                 </label>
                             </div>
                             <div class="form-group">