From 0a8697f885a2f0831a4d78ddf1b1808553e47b3a Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Wed, 26 Jan 2022 18:05:04 +0100
Subject: [PATCH 1/7] Add multiple subcommands and add one for creating an
 admin account

---
 .../Generate_GraphQL_Schema.xml               |  4 +-
 .idea/runConfigurations/Run_Backend.xml       |  1 +
 .../app/ehrenamtskarte/backend/EntryPoint.kt  | 65 ++++++++++++-------
 .../backend/common/database/Database.kt       |  5 ++
 docs/development-setup.md                     | 19 +++---
 docs/graphql_generation.md                    |  2 +-
 docs/staging-setup.md                         |  7 ++
 7 files changed, 69 insertions(+), 34 deletions(-)

diff --git a/.idea/runConfigurations/Generate_GraphQL_Schema.xml b/.idea/runConfigurations/Generate_GraphQL_Schema.xml
index 4ffc6fbb2..569f4a0a7 100644
--- a/.idea/runConfigurations/Generate_GraphQL_Schema.xml
+++ b/.idea/runConfigurations/Generate_GraphQL_Schema.xml
@@ -9,13 +9,15 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/backend" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="run --args=&quot;--export-api=../specs/backend-api.graphql&quot;" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
           <option value="run" />
+          <option value="run" />
+          <option value="--args=&quot;graphql-export ../specs/backend-api.graphql&quot;" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/.idea/runConfigurations/Run_Backend.xml b/.idea/runConfigurations/Run_Backend.xml
index 32052c54d..f1fa326b1 100644
--- a/.idea/runConfigurations/Run_Backend.xml
+++ b/.idea/runConfigurations/Run_Backend.xml
@@ -16,6 +16,7 @@
       <option name="taskNames">
         <list>
           <option value="run" />
+          <option value="--args=&quot;execute&quot;" />
         </list>
       </option>
       <option name="vmOptions" value="" />
diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
index 286c32265..256ef261e 100644
--- a/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
+++ b/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
@@ -7,35 +7,56 @@ import app.ehrenamtskarte.backend.stores.importer.DataImporter
 import com.expediagroup.graphql.extensions.print
 import com.github.ajalt.clikt.core.CliktCommand
 import com.github.ajalt.clikt.core.ProgramResult
-import com.github.ajalt.clikt.parameters.options.flag
-import com.github.ajalt.clikt.parameters.options.option
+import com.github.ajalt.clikt.core.subcommands
+import com.github.ajalt.clikt.parameters.arguments.argument
 import java.io.File
 
-
 class Entry : CliktCommand() {
-    private val exportApi by option(help = "Export GraphQL schema. Given ")
-    private val importFlag by option("--import").flag()
+    override fun run() {
+    }
+}
 
+class GraphQLExport : CliktCommand(name = "graphql-export") {
+    private val path by argument(help = "Export GraphQL schema. Given ")
     override fun run() {
-        val production = System.getProperty("app.production", "").isNotEmpty()
+        val schema = GraphQLHandler().graphQLSchema.print()
+        val file = File(path)
+        file.writeText(schema)
+    }
+}
 
-        val exportApi = exportApi
-        if (exportApi != null) {
-            val schema = GraphQLHandler().graphQLSchema.print()
-            val file = File(exportApi)
-            file.writeText(schema)
-        } else {
-            Database.setup(!production)
-            if (importFlag) {
-                println("Importing data from Lbe")
-                if (!DataImporter.import(!production)) {
-                    throw ProgramResult(statusCode = 5)
-                }
-            } else {
-                WebService().start(production)
-            }
+class Import : CliktCommand(help = "Imports stores from a configured data source. Various properties must be set.") {
+    override fun run() {
+        val production = System.getProperty("app.production", "").isNotEmpty()
+        Database.setup(!production)
+        if (!DataImporter.import(!production)) {
+            throw ProgramResult(statusCode = 5)
         }
     }
 }
 
-fun main(argv: Array<String>) = Entry().main(argv)
+class CreateAdmin : CliktCommand(help =  "Creates an admin account with the specified email and password") {
+    private val email by argument(
+        help = "The email"
+    )
+    
+    private val password by argument(
+        help = "The password"
+    )
+    
+    override fun run() {
+        val production = System.getProperty("app.production", "").isNotEmpty()
+        Database.setup(!production)
+        Database.createAccount(email, password)
+    }
+}
+
+class Execute : CliktCommand(help = "Starts the webserver") {
+    override fun run() {
+        val production = System.getProperty("app.production", "").isNotEmpty()
+        Database.setup(!production)
+        WebService().start(production)
+    }
+}
+
+fun main(args: Array<String>) = Entry().subcommands(Execute(), Import(), CreateAdmin(), GraphQLExport()).main(args)
diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
index 333cd7a2c..03d91b579 100644
--- a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
+++ b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
@@ -1,5 +1,6 @@
 package app.ehrenamtskarte.backend.common.database
 
+import app.ehrenamtskarte.backend.auth.database.repos.AdministratorsRepository
 import org.jetbrains.exposed.sql.Database.Companion.connect
 import org.jetbrains.exposed.sql.StdOutSqlLogger
 import org.jetbrains.exposed.sql.addLogger
@@ -30,6 +31,10 @@ class Database {
             }
         }
 
+        fun createAccount(email: String, password: String) {
+            AdministratorsRepository.insert(email, password)
+        }
+        
         fun setup(logging: Boolean) {
             Database().db
 
diff --git a/docs/development-setup.md b/docs/development-setup.md
index 4d152deae..6cf3aec7e 100644
--- a/docs/development-setup.md
+++ b/docs/development-setup.md
@@ -24,23 +24,22 @@ This short guide focuses on setting up the project using IntelliJ instead of And
 
 1. Install docker and docker-compose
 2. `sudo docker-compose rm`
-2. `sudo docker-compose build`
-2. `sudo docker-compose up --force-recreate`
-3. Open Adminer: [http://localhost:5001](http://127.0.0.1:5001/?pgsql=db-postgis&username=postgres&db=ehrenamtskarte)
-
+3. `sudo docker-compose build`
+4. `sudo docker-compose up --force-recreate`
+5. Open Adminer: [http://localhost:5001](http://127.0.0.1:5001/?pgsql=db-postgis&username=postgres&db=ehrenamtskarte)
    The credentials are:
-
    |Property|Value|
    |---|---|
    |Host (within Docker)|db-postgis|
    |Username|postgres|
    |Password|postgres|
    |Database|ehrenamtskarte|
-4. Install JDK8
-5. Run the backend: `cd backend && ./gradlew run` or `.\backend\gradlew.bat run` on Windows
-6. Take a look at the martin endpoints: [http://localhost:5002/tiles/accepting_stores/index.json](http://localhost:5002/tiles/accepting_stores/index.json) and [http://localhost:5002/tiles/accepting_stores/rpc/index.json](http://localhost:5002/tiles/accepting_stores/rpc/index.json). The data shown on the map is fetched from a hardcoded url and is not using the data from the local martin!
-7. Take a look at the style by viewing the test map: [http://localhost:5002](http://localhost:5002)
-8. Take a look at the backend: [http://localhost:7000](http://localhost:7000) (The public version is available at api.ehrenamtskarte.app)
+6. Install JDK8
+7. Run the backend: `cd backend && ./gradlew run --args="execute"` or `.\backend\gradlew.bat run --args="execute"` on Windows
+8. Create an admin account using `./gradlew run --args="create-admin <email> <password>"`
+9. Take a look at the martin endpoints: [http://localhost:5002/tiles/accepting_stores/index.json](http://localhost:5002/tiles/accepting_stores/index.json) and [http://localhost:5002/tiles/accepting_stores/rpc/index.json](http://localhost:5002/tiles/accepting_stores/rpc/index.json). The data shown on the map is fetched from a hardcoded url and is not using the data from the local martin!
+10. Take a look at the style by viewing the test map: [http://localhost:5002](http://localhost:5002)
+11. Take a look at the backend: [http://localhost:7000](http://localhost:7000) (The public version is available at api.ehrenamtskarte.app)
 
 ## Dumping and restoring the database through docker
 
diff --git a/docs/graphql_generation.md b/docs/graphql_generation.md
index 1992318fd..f78e81a53 100644
--- a/docs/graphql_generation.md
+++ b/docs/graphql_generation.md
@@ -5,7 +5,7 @@ Queries are specified in [frontend/graphql_queries](../frontend/graphql_queries)
 
 ## Generate API Files
 1. If schema changed: Generate updated GraphQL schema into [schema.graphql](../frontend/schema.graphql)
-   Run "Generate GraphQL" in Intellij (or ```./gradlew run --args="--export-api=../frontend/schema.graphql"``` in the backend folder)
+   Run "Generate GraphQL" in Intellij (or `./gradlew run --args="graphql-export ../specs/backend-api.graphql"` in the backend folder)
 2. Run "Generate GraphQL Flutter Client" (or first copy `backend/schema.graphql` to `frontend/schema.graphql` and 
    run ```flutter pub run build_runner build --delete-conflicting-outputs``` in the `frontend` directory
 3. Run "Generate GraphQL React Client" (or `npm generate-graphql` in the `administration` directory)
diff --git a/docs/staging-setup.md b/docs/staging-setup.md
index 4d8afa28c..1a2bab07f 100644
--- a/docs/staging-setup.md
+++ b/docs/staging-setup.md
@@ -111,6 +111,13 @@ ogr2ogr -f "PostgreSQL" PG:"dbname=ehrenamtskarte host='localhost' port='5432' u
 
 After starting `docker-compose` with the staging configuration, the setup should be available at port 80: `docker-compose -f docker-compose.yml -f docker-compose.staging.yml up`.
 
+## Admin Account Creation
+
+It is possible to create an admin account by running:
+```bash
+ ./gradlew run --args="create-admin <email> <password>"
+```
+
 ## Importing EAK data on staging
 
 To import the EAK data using docker, run the following:

From 9a117e4447732d342984dbf3cce4fc6c6280cde8 Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Tue, 1 Feb 2022 17:34:09 +0000
Subject: [PATCH 2/7] Add transaction

---
 .../app/ehrenamtskarte/backend/common/database/Database.kt    | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
index 03d91b579..b5ab20854 100644
--- a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
+++ b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/database/Database.kt
@@ -32,7 +32,9 @@ class Database {
         }
 
         fun createAccount(email: String, password: String) {
-            AdministratorsRepository.insert(email, password)
+            transaction {
+                AdministratorsRepository.insert(email, password)     
+            }
         }
         
         fun setup(logging: Boolean) {

From 249e2cf158e396722c6c66cccd07af7dae959742 Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Tue, 1 Feb 2022 17:34:22 +0000
Subject: [PATCH 3/7] Deduplicate code

---
 .../app/ehrenamtskarte/backend/EntryPoint.kt  | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
index 256ef261e..537f1535d 100644
--- a/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
+++ b/backend/src/main/kotlin/app/ehrenamtskarte/backend/EntryPoint.kt
@@ -12,8 +12,15 @@ import com.github.ajalt.clikt.parameters.arguments.argument
 import java.io.File
 
 class Entry : CliktCommand() {
+    companion object {
+        fun isProductionEnvironment(): Boolean {
+            return System.getProperty("app.production", "").isNotEmpty()
+        }
+    }
+
     override fun run() {
     }
+
 }
 
 class GraphQLExport : CliktCommand(name = "graphql-export") {
@@ -27,7 +34,7 @@ class GraphQLExport : CliktCommand(name = "graphql-export") {
 
 class Import : CliktCommand(help = "Imports stores from a configured data source. Various properties must be set.") {
     override fun run() {
-        val production = System.getProperty("app.production", "").isNotEmpty()
+        val production = Entry.isProductionEnvironment()
         Database.setup(!production)
         if (!DataImporter.import(!production)) {
             throw ProgramResult(statusCode = 5)
@@ -35,17 +42,17 @@ class Import : CliktCommand(help = "Imports stores from a configured data source
     }
 }
 
-class CreateAdmin : CliktCommand(help =  "Creates an admin account with the specified email and password") {
+class CreateAdmin : CliktCommand(help = "Creates an admin account with the specified email and password") {
     private val email by argument(
         help = "The email"
     )
-    
+
     private val password by argument(
         help = "The password"
     )
-    
+
     override fun run() {
-        val production = System.getProperty("app.production", "").isNotEmpty()
+        val production = Entry.isProductionEnvironment()
         Database.setup(!production)
         Database.createAccount(email, password)
     }
@@ -53,7 +60,7 @@ class CreateAdmin : CliktCommand(help =  "Creates an admin account with the spec
 
 class Execute : CliktCommand(help = "Starts the webserver") {
     override fun run() {
-        val production = System.getProperty("app.production", "").isNotEmpty()
+        val production = Entry.isProductionEnvironment()
         Database.setup(!production)
         WebService().start(production)
     }

From 9a0a62074dde854275cfeec829d2dac3dae65caa Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Tue, 1 Feb 2022 17:37:42 +0000
Subject: [PATCH 4/7] Update run configs

---
 ...enerate_GraphQL_Schema.xml => GraphQL_Schema_Export.xml} | 2 +-
 .../{Run_Backend_with_import.xml => Import.xml}             | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)
 rename .idea/runConfigurations/{Generate_GraphQL_Schema.xml => GraphQL_Schema_Export.xml} (88%)
 rename .idea/runConfigurations/{Run_Backend_with_import.xml => Import.xml} (77%)

diff --git a/.idea/runConfigurations/Generate_GraphQL_Schema.xml b/.idea/runConfigurations/GraphQL_Schema_Export.xml
similarity index 88%
rename from .idea/runConfigurations/Generate_GraphQL_Schema.xml
rename to .idea/runConfigurations/GraphQL_Schema_Export.xml
index 569f4a0a7..3ae5c497e 100644
--- a/.idea/runConfigurations/Generate_GraphQL_Schema.xml
+++ b/.idea/runConfigurations/GraphQL_Schema_Export.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Generate GraphQL Schema" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="GraphQL Schema Export" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
diff --git a/.idea/runConfigurations/Run_Backend_with_import.xml b/.idea/runConfigurations/Import.xml
similarity index 77%
rename from .idea/runConfigurations/Run_Backend_with_import.xml
rename to .idea/runConfigurations/Import.xml
index 2f0cf23c7..8fc4f2a8a 100644
--- a/.idea/runConfigurations/Run_Backend_with_import.xml
+++ b/.idea/runConfigurations/Import.xml
@@ -1,5 +1,5 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Run Backend with import" type="GradleRunConfiguration" factoryName="Gradle">
+  <configuration default="false" name="Import" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
     <ExternalSystemSettings>
       <option name="env">
         <map>
@@ -9,13 +9,15 @@
       <option name="executionName" />
       <option name="externalProjectPath" value="$PROJECT_DIR$/backend" />
       <option name="externalSystemIdString" value="GRADLE" />
-      <option name="scriptParameters" value="run --args=&quot;--import&quot;" />
+      <option name="scriptParameters" value="" />
       <option name="taskDescriptions">
         <list />
       </option>
       <option name="taskNames">
         <list>
           <option value="run" />
+          <option value="run" />
+          <option value="--args=&quot;import&quot;" />
         </list>
       </option>
       <option name="vmOptions" value="" />

From a63446f758e7e509e4e1473df5e680f105886bfd Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Tue, 1 Feb 2022 17:45:56 +0000
Subject: [PATCH 5/7] Update service file

---
 scripts/eak-backend.service | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/eak-backend.service b/scripts/eak-backend.service
index dcd9fb865..944c19166 100644
--- a/scripts/eak-backend.service
+++ b/scripts/eak-backend.service
@@ -7,7 +7,7 @@ StartLimitBurst=5
 
 [Service]
 Type=simple
-ExecStart=/opt/ehrenamtskarte/backend/bin/backend
+ExecStart=/opt/ehrenamtskarte/backend/bin/backend execute
 Restart=on-failure
 RestartSec=5s
 

From ca1bf3fc1a6ed2daa004d3dc754ec89e8fb6a41b Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Tue, 1 Feb 2022 17:51:23 +0000
Subject: [PATCH 6/7] Fix docker file

---
 backend/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/backend/Dockerfile b/backend/Dockerfile
index 13aa51f5b..b589c8ab6 100644
--- a/backend/Dockerfile
+++ b/backend/Dockerfile
@@ -9,4 +9,4 @@ FROM openjdk:8-jre-slim
 
 WORKDIR /backend
 COPY --from=build /output/* .
-ENTRYPOINT ["./bin/backend"]
+ENTRYPOINT ["./bin/backend", "execute"]

From 54b2d1dd50b41af37c903ec9fe1d060fcb1e4f05 Mon Sep 17 00:00:00 2001
From: Maximilian Ammann <max@maxammann.org>
Date: Wed, 2 Feb 2022 12:33:13 +0000
Subject: [PATCH 7/7] Add run config for account creation

---
 .../Create_Admin_Account.xml                  | 30 +++++++++++++++++++
 1 file changed, 30 insertions(+)
 create mode 100644 .idea/runConfigurations/Create_Admin_Account.xml

diff --git a/.idea/runConfigurations/Create_Admin_Account.xml b/.idea/runConfigurations/Create_Admin_Account.xml
new file mode 100644
index 000000000..b1e791235
--- /dev/null
+++ b/.idea/runConfigurations/Create_Admin_Account.xml
@@ -0,0 +1,30 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="Create Admin Account" type="GradleRunConfiguration" factoryName="Gradle" folderName="Backend Commands">
+    <ExternalSystemSettings>
+      <option name="env">
+        <map>
+          <entry key="JWT_SECRET" value="&quot;Hello world!&quot;" />
+        </map>
+      </option>
+      <option name="executionName" />
+      <option name="externalProjectPath" value="$PROJECT_DIR$/backend" />
+      <option name="externalSystemIdString" value="GRADLE" />
+      <option name="scriptParameters" value="" />
+      <option name="taskDescriptions">
+        <list />
+      </option>
+      <option name="taskNames">
+        <list>
+          <option value="run" />
+          <option value="run" />
+          <option value="--args=&quot;create-admin admin@example.com admin&quot;" />
+        </list>
+      </option>
+      <option name="vmOptions" value="" />
+    </ExternalSystemSettings>
+    <ExternalSystemDebugServerProcess>true</ExternalSystemDebugServerProcess>
+    <ExternalSystemReattachDebugProcess>true</ExternalSystemReattachDebugProcess>
+    <DebugAllEnabled>false</DebugAllEnabled>
+    <method v="2" />
+  </configuration>
+</component>
\ No newline at end of file