From 4df80473325b593d6d48e830c918ec47a322280f Mon Sep 17 00:00:00 2001
From: James Santucci <james.santucci@gmail.com>
Date: Fri, 24 Sep 2021 15:22:14 -0600
Subject: [PATCH] flip order for flag / env configured variables

---
 .../azavea/franklin/commands/ApiOptions.scala | 26 +++++++++----------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/application/src/main/scala/com/azavea/franklin/commands/ApiOptions.scala b/application/src/main/scala/com/azavea/franklin/commands/ApiOptions.scala
index 55025b92a..3a06c9af8 100644
--- a/application/src/main/scala/com/azavea/franklin/commands/ApiOptions.scala
+++ b/application/src/main/scala/com/azavea/franklin/commands/ApiOptions.scala
@@ -68,34 +68,34 @@ trait ApiOptions {
     "Whether to respond to transaction requests, like adding or updating items. Default: 'false'."
 
   private val enableTransactions = Opts
-    .flag(
-      "with-transactions",
-      help = enableTransactionsHelp
-    )
-    .orFalse orElse Opts
     .env[String]("API_WITH_TRANSACTIONS", help = enableTransactionsHelp, metavar = "true||false")
     .mapValidated { s =>
       Validated
         .fromTry(Try(s.toBoolean))
         .leftMap(_ => s"Expected to find a value that can convert to a Boolean, but got $s")
         .toValidatedNel
-    } withDefault (false)
+    } orElse Opts
+    .flag(
+      "with-transactions",
+      help = enableTransactionsHelp
+    )
+    .orFalse
 
   private val enableTilesHelp = "Whether to include tile endpoints. Default: 'false'."
 
   private val enableTiles = Opts
-    .flag(
-      "with-tiles",
-      help = enableTilesHelp
-    )
-    .orFalse orElse Opts
     .env[String]("API_WITH_TILES", help = enableTilesHelp, metavar = "true||false")
     .mapValidated { s =>
       Validated
         .fromTry(Try(s.toBoolean))
         .leftMap(_ => s"Expected to find a value that can convert to a Boolean, but got $s")
         .toValidatedNel
-    } withDefault (false)
+    } orElse Opts
+    .flag(
+      "with-tiles",
+      help = enableTilesHelp
+    )
+    .orFalse
 
   private val runMigrations =
     Opts.flag("run-migrations", "Run migrations before the API server starts").orFalse
@@ -110,5 +110,5 @@ trait ApiOptions {
     enableTransactions,
     enableTiles,
     runMigrations
-  ) mapN ApiConfig
+  ) mapN ApiConfig.apply
 }