codinux
/
eInvoicing
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Mapping sent to Instant; also mapping received and messageNumber

This commit is contained in:
dankito 2024-11-21 17:02:38 +01:00
parent 07fdbec5d7
commit b09b7cf69b
2 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
e-invoicing-domain/src/main/kotlin/net/codinux/invoicing/mail/MailReader.kt
View File

@ -15,8 +15,7 @@ import net.codinux.invoicing.reader.EInvoiceReader
import net.codinux.log.logger import net.codinux.log.logger
import org.eclipse.angus.mail.imap.IMAPFolder import org.eclipse.angus.mail.imap.IMAPFolder
import java.io.File import java.io.File
import java.time.LocalDate import java.time.Instant
import java.time.ZoneId
import java.util.* import java.util.*
import java.util.concurrent.Executors import java.util.concurrent.Executors
@ -101,7 +100,11 @@ class MailReader(
} }
if (attachmentsWithEInvoice.isNotEmpty()) { if (attachmentsWithEInvoice.isNotEmpty()) {
return@mapNotNull MailWithInvoice(message.from.joinToString(), message.subject, map(message.sentDate), attachmentsWithEInvoice) return@mapNotNull MailWithInvoice(
message.from.joinToString(), message.subject,
map(message.sentDate), map(message.receivedDate), message.messageNumber,
attachmentsWithEInvoice
)
} }
} }
} catch (e: Throwable) { } catch (e: Throwable) {
@ -153,9 +156,8 @@ class MailReader(
null null
} }
// TODO: same code as in MustangMapper private fun map(date: Date): Instant =
private fun map(date: Date): LocalDate = date.toInstant()
date.toInstant().atZone(ZoneId.systemDefault()).toLocalDate()
private fun <T> connect(account: MailAccount, connected: (Store) -> T?): T? { private fun <T> connect(account: MailAccount, connected: (Store) -> T?): T? {

9
e-invoicing-domain/src/main/kotlin/net/codinux/invoicing/mail/MailWithInvoice.kt
View File

@ -1,12 +1,15 @@
package net.codinux.invoicing.mail package net.codinux.invoicing.mail
import java.time.LocalDate import java.time.Instant
import java.time.ZoneId
class MailWithInvoice( class MailWithInvoice(
val sender: String, val sender: String,
val subject: String, val subject: String,
val date: LocalDate, val sent: Instant,
val received: Instant,
val messageNumber: Int,
val attachmentsWithEInvoice: List<MailAttachmentWithEInvoice> val attachmentsWithEInvoice: List<MailAttachmentWithEInvoice>
) { ) {
override fun toString() = "$date $sender: $subject, ${attachmentsWithEInvoice.size} invoices" override fun toString() = "${sent.atZone(ZoneId.systemDefault()).toLocalDate()} $sender: $subject, ${attachmentsWithEInvoice.size} invoice(s)"
} }