1571: increase max request size from 1MB to 5MB, fix getDiscount

digitalfabrik · Sep 14, 2024 · e515ae2 · e515ae2
1 parent e1f49cc
commit e515ae2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/administration/src/bp-modules/stores/StoresImportDuplicates.tsx b/administration/src/bp-modules/stores/StoresImportDuplicates.tsx
@@ -12,7 +12,7 @@ const StoresImportDuplicates = ({ entries }: StoresImportDuplicatesProps): React
     <Container>
       Die CSV enthält doppelte Einträge:
       {entries.map((entry, index) => (
-        <span key={index}>Eintrag {entry.join(' und ')} sind identisch.</span>
+        <span key={index}>Eintrag {entry.join(', ')} sind identisch.</span>
       ))}
       Bitte löschen Sie die doppelten Einträge.
     </Container>

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/WebService.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/common/webservice/WebService.kt
@@ -41,6 +41,7 @@ class WebService {
                 cfg.bundledPlugins.enableDevLogging()
                 cfg.bundledPlugins.enableCors { cors -> cors.addRule { it.anyHost() } }
             }
+            cfg.http.maxRequestSize = 5000000
             cfg.staticFiles.add {
                 it.directory = "/graphiql"
                 it.hostedPath = "/graphiql"

diff --git a/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/utils/MapCsvToStore.kt b/backend/src/main/kotlin/app/ehrenamtskarte/backend/stores/utils/MapCsvToStore.kt
@@ -4,16 +4,14 @@ import app.ehrenamtskarte.backend.stores.COUNTRY_CODE
 import app.ehrenamtskarte.backend.stores.importer.common.types.AcceptingStore
 import app.ehrenamtskarte.backend.stores.webservice.schema.types.CSVAcceptingStore
 
-fun getDiscount(discountDE: String?, discountEN: String?): String? {
-    if (discountDE.isNullOrEmpty() && discountEN.isNullOrEmpty()) {
-        return null
-    }
-    return discountDE.orEmpty() + "\n\n" + discountEN.orEmpty()
+fun getDiscount(discounts: MutableList<String?>): String {
+    discounts.removeIf { it.isNullOrEmpty() }
+    return discounts.joinToString("\n\n")
 }
 fun mapCsvToStore(csvStore: CSVAcceptingStore): AcceptingStore {
-    val discount = getDiscount(csvStore.discountDE, csvStore.discountEN)
+    val discount = getDiscount(mutableListOf(csvStore.discountDE, csvStore.discountEN))
     return AcceptingStore(
         csvStore.name!!, COUNTRY_CODE, csvStore.location!!, csvStore.postalCode!!, csvStore.street!!, csvStore.houseNumber!!, "", csvStore.longitude!!.toDouble(), csvStore.latitude!!.toDouble(), csvStore.categoryId!!.toInt(), csvStore.email.clean(false), csvStore.telephone.clean(false),
-        csvStore.homepage.clean(false), discount, null, null
+        csvStore.homepage.clean(false), discount.clean(false), null, null
     )
 }