Belcotax dispatch feedback

Author: rokeppen

src/main/kotlin/be/sgl/backend/repository/activity/ActivityRegistrationRepository.kt

@@ -3,7 +3,6 @@ package be.sgl.backend.repository.activity
 import be.sgl.backend.entity.branch.Branch
 import be.sgl.backend.entity.registrable.activity.Activity
 import be.sgl.backend.entity.registrable.activity.ActivityRegistration
-import be.sgl.backend.entity.registrable.activity.ActivityRestriction
 import be.sgl.backend.entity.user.User
 import be.sgl.backend.repository.PaymentRepository
 import org.springframework.data.jpa.repository.JpaRepository

src/main/kotlin/be/sgl/backend/service/MailService.kt

@@ -55,7 +55,7 @@ class MailService {
             val organization = organizationRepository.getByType(OrganizationType.OWNER)
                 ?: throw IncompleteConfigurationException("No organization configured!")
             return organization.getEmail()
-                ?: throw IncompleteConfigurationException("No organization email configured, not able to send forms!")
+                ?: throw IncompleteConfigurationException("No organization email configured!")
         }
 
         fun to(vararg to: String) = apply { this.to.addAll(to) }

src/main/kotlin/be/sgl/backend/service/belcotax/BelcotaxService.kt

@@ -33,7 +33,10 @@ class BelcotaxService {
     fun getDispatchForPreviousYear(): Verzendingen {
         val (beginOfYear, endOfYear) = getPreviousYearPeriod()
         val activities = registrationRepository.getPaidRegistrationsBetween(beginOfYear, endOfYear).filter(::relevantActivity)
-        val forms = activities.groupBy { it.user }.flatMap { (user, activities) -> activities.asForms(user) }
+        val forms = activities.groupBy { it.user }
+            .filter { it.key.nis != null && it.key.taxableParent?.address != null }
+            .flatMap { (user, activities) -> activities.asForms(user) }
+        if (forms.isEmpty()) throw LocalizedException("belcotax.service.dispatch.no.activities")
         return dispatchService.createDispatch(forms)
     }
 

src/main/kotlin/be/sgl/backend/service/belcotax/DispatchService.kt

@@ -2,10 +2,7 @@ package be.sgl.backend.service.belcotax
 
 import be.sgl.backend.dto.DeclarationFormDTO
 import be.sgl.backend.entity.organization.Organization
-import be.sgl.backend.entity.user.User
-import be.sgl.backend.service.SettingService
 import be.sgl.backend.service.organization.OrganizationProvider
-import be.sgl.backend.service.user.UserDataProvider
 import generated.*
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.context.i18n.LocaleContextHolder

src/main/kotlin/be/sgl/backend/service/belcotax/FormService.kt

@@ -37,17 +37,17 @@ class FormService {
             "name" to form.user.name,
             "first_name" to form.user.firstName,
             "birth_date" to form.user.birthdate.belgian(),
-            "street" to form.parent.address?.street,
-            "no" to "${form.parent.address?.number}${form.parent.address?.subPremise ?: ""}",
-            "zip" to form.parent.address?.zipcode,
-            "town" to form.parent.address?.town,
+            "street" to form.address.street,
+            "no" to "${form.address.number}${form.address.subPremise ?: ""}",
+            "zip" to form.address.zipcode,
+            "town" to form.address.town,
             "nis_nr" to form.parent.nis,
             "debtor_name" to form.parent.name,
             "debtor_first_name" to form.parent.firstName,
-            "debtor_street" to form.parent.address?.street,
-            "debtor_no" to "${form.parent.address?.number}${form.parent.address?.subPremise ?: ""}",
-            "debtor_zip" to form.parent.address?.zipcode,
-            "debtor_town" to form.parent.address?.town,
+            "debtor_street" to form.address.street,
+            "debtor_no" to "${form.address.number}${form.address.subPremise ?: ""}",
+            "debtor_zip" to form.address.zipcode,
+            "debtor_town" to form.address.town,
             "debtor_nis_nr" to form.parent.nis,
             "id" to form.id,
             "year" to form.year,

src/main/resources/messages_nl_BE.properties

@@ -61,4 +61,5 @@ NotNull.calendarPeriod.end = De einddatum mag niet leeg zijn!
 belcotax.service.form.user.no.nis = Er is geen rijksregisternummer gekend voor jouw gebruiker!
 belcotax.service.form.user.no.taxable.parent = Er werd geen ouder ten laste gevonden in jouw contacten met een rijksregisternummer!
 belcotax.service.forms.user.no.parent.address = Er werd geen adres gevonden gelinkt aan de ouder ten laste!
-belcotax.service.forms.user.no.activities = Er werden geen activiteiten gevonden waarbij je vorig jaar jonger dan {0} was!
+belcotax.service.forms.user.no.activities = Er werden geen activiteiten gevonden waarbij je vorig jaar jonger dan {0} was!
+belcotax.service.dispatch.no.activities = Er werden voor vorig jaar geen activiteiten gevonden met relevante deelnemers!