Initial Nekku code changes

espoon-voltti · Feb 7, 2025 · 76ba308 · 76ba308
1 parent c44c724
commit 76ba308
Show file tree

Hide file tree

Showing 6 changed files with 55 additions and 2 deletions.
diff --git a/frontend/src/employee-frontend/components/unit/tab-groups/groups/group/GroupUpdateModal.tsx b/frontend/src/employee-frontend/components/unit/tab-groups/groups/group/GroupUpdateModal.tsx
@@ -116,6 +116,30 @@ export default React.memo(function GroupUpdateModal({ group }: Props) {
               />
             </>
           )}
+          {featureFlags.nekkuIntegration && (
+            <>
+              <Gap size="s" />
+              <div className="bold">
+                {i18n.unit.groups.updateModal.jamixTitle}
+              </div>
+              <InputField
+                value={data.jamixCustomerNumber?.toString() ?? ''}
+                onChange={(value) => {
+                  if (/^\d*$/.exec(value)) {
+                    const parsedNumber = parseInt(value)
+                    setData((state) => ({
+                      ...state,
+                      jamixCustomerNumber: isNaN(parsedNumber)
+                        ? null
+                        : parsedNumber
+                    }))
+                  }
+                }}
+                data-qa="jamix-customer-id-input"
+                placeholder={i18n.unit.groups.updateModal.nekkuPlaceholder}
+              />
+            </>
+          )}
         </section>
         <InfoBox message={i18n.unit.groups.updateModal.info} thin />
       </FixedSpaceColumn>

diff --git a/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx b/frontend/src/lib-customizations/defaults/employee/i18n/fi.tsx
@@ -2491,6 +2491,7 @@ export const fi = {
         endDate: 'Viimeinen toimintapäivä',
         info: 'Ryhmän aikaisempia tietoja ei säilytetä',
         jamixPlaceholder: 'Jamix customerNumber',
+        nekkuPlaceholder: 'Nekku asiakasnumero',
         jamixTitle: 'Ruokatilausten asiakasnumero'
       },
       startDate: 'Perustettu',

diff --git a/frontend/src/lib-customizations/espoo/featureFlags.tsx b/frontend/src/lib-customizations/espoo/featureFlags.tsx
@@ -40,7 +40,8 @@ const features: Features = {
     intermittentShiftCare: false,
     noAbsenceType: false,
     discussionReservations: true,
-    jamixIntegration: true,
+    jamixIntegration: false,
+    nekkuIntegration: true,
     forceUnpublishDocumentTemplate: true,
     invoiceDisplayAccountNumber: true,
     serviceApplications: true,
@@ -77,7 +78,8 @@ const features: Features = {
     intermittentShiftCare: false,
     noAbsenceType: false,
     discussionReservations: true,
-    jamixIntegration: true,
+    jamixIntegration: false,
+    nekkuIntegration: true,
     forceUnpublishDocumentTemplate: true,
     invoiceDisplayAccountNumber: true,
     serviceApplications: true,

diff --git a/frontend/src/lib-customizations/types.d.ts b/frontend/src/lib-customizations/types.d.ts
@@ -252,6 +252,11 @@ interface BaseFeatureFlags {
    */
   aromiIntegration?: boolean
 
+  /**
+   * Display Nekku food ordering service related functions
+   */
+  nekkuIntegration?: boolean
+
   /**
    * Allow admin to force unpublish document templates.
    * Do not set in production.

diff --git a/service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt b/service/src/main/kotlin/fi/espoo/evaka/EvakaEnv.kt
@@ -29,6 +29,7 @@ data class EvakaEnv(
     val vtjEnabled: Boolean,
     val webPushEnabled: Boolean,
     val jamixEnabled: Boolean,
+    val nekkuEnabled: Boolean,
     val forceUnpublishDocumentTemplateEnabled: Boolean,
     val asyncJobRunnerDisabled: Boolean,
     val frontendBaseUrlFi: String,
@@ -51,6 +52,7 @@ data class EvakaEnv(
                 vtjEnabled = env.lookup("evaka.integration.vtj.enabled") ?: false,
                 webPushEnabled = env.lookup("evaka.web_push.enabled") ?: false,
                 jamixEnabled = env.lookup("evaka.integration.jamix.enabled") ?: false,
+                nekkuEnabled = env.lookup("evaka.integration.nekku.enabled") ?: false,
                 forceUnpublishDocumentTemplateEnabled =
                     env.lookup("evaka.not_for_prod.force_unpublish_document_template_enabled")
                         ?: false,
@@ -627,6 +629,18 @@ data class JamixEnv(val url: URI, val user: String, val password: Sensitive<Stri
     }
 }
 
+data class NekkuEnv(val url: URI, val apikey: Sensitive<String>) {
+    companion object {
+        fun fromEnvironment(env: Environment): NekkuEnv {
+            return NekkuEnv(
+                // URL up to the operation name/
+                url = URI.create(env.lookup("evaka.integration.nekku.url")),
+                apikey = Sensitive(env.lookup("evaka.integration.nekku.apikey")),
+            )
+        }
+    }
+}
+
 data class Sensitive<T>(@JsonValue val value: T) {
     override fun toString(): String = "**REDACTED**"
 }

diff --git a/service/src/main/kotlin/fi/espoo/evaka/shared/config/EnvConfig.kt b/service/src/main/kotlin/fi/espoo/evaka/shared/config/EnvConfig.kt
@@ -13,6 +13,7 @@ import fi.espoo.evaka.EvakaEnv
 import fi.espoo.evaka.JamixEnv
 import fi.espoo.evaka.JwtEnv
 import fi.espoo.evaka.KoskiEnv
+import fi.espoo.evaka.NekkuEnv
 import fi.espoo.evaka.OphEnv
 import fi.espoo.evaka.ScheduledJobsEnv
 import fi.espoo.evaka.SfiEnv
@@ -92,4 +93,10 @@ class EnvConfig {
             true -> JamixEnv.fromEnvironment(env)
             false -> null
         }
+
+    fun nekkuEnv(evakaEnv: EvakaEnv, env: Environment): NekkuEnv? =
+        when (evakaEnv.nekkuEnabled) {
+            true -> NekkuEnv.fromEnvironment(env)
+            false -> null
+        }
 }