solution for booking date bug #18 #23
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -3,7 +3,6 @@ package swift | |
| import ( | ||
| "bytes" | ||
| "fmt" | ||
| "strconv" | ||
| "strings" | ||
| "time" | ||
|
|
@@ -15,6 +14,7 @@ import ( | |
|
|
||
| // MT940 represents a S.W.I.F.T. Transaction Report | ||
| type MT940 struct { | ||
| ReferenceDate time.Time | ||
| JobReference *AlphaNumericTag | ||
| Reference *AlphaNumericTag | ||
| Account *AccountTag | ||
|
|
@@ -163,7 +163,7 @@ func (b *BalanceTag) Balance() domain.Balance { | |
| } | ||
|
|
||
| // Unmarshal unmarshals value into b | ||
| func (b *BalanceTag) Unmarshal(value []byte, today time.Time) error { | ||
| elements, err := extractTagElements(value) | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -175,7 +175,7 @@ func (b *BalanceTag) Unmarshal(value []byte) error { | |
| buf := bytes.NewBuffer(elements[1]) | ||
| b.DebitCreditIndicator = string(buf.Next(1)) | ||
| dateBytes := buf.Next(6) | ||
| date, err := parseDate(dateBytes, today.Year()) | ||
| if err != nil { | ||
| return errors.WithMessage(err, "unmarshal balance tag: parsing booking date") | ||
| } | ||
|
|
@@ -212,7 +212,7 @@ type TransactionTag struct { | |
| } | ||
|
|
||
| // Unmarshal unmarshals value into t | ||
| func (t *TransactionTag) Unmarshal(value []byte, bookingYear int) error { | ||
| elements, err := extractTagElements(value) | ||
| if err != nil { | ||
| return err | ||
|
|
@@ -223,7 +223,7 @@ func (t *TransactionTag) Unmarshal(value []byte) error { | |
| t.Tag = string(elements[0]) | ||
| buf := bytes.NewBuffer(elements[1]) | ||
| dateBytes := buf.Next(6) | ||
| date, err := parseDate(dateBytes, bookingYear) | ||
| if err != nil { | ||
| return errors.WithMessage(err, "unmarshal transaction tag: parsing valuta date") | ||
| } | ||
|
|
@@ -235,13 +235,13 @@ func (t *TransactionTag) Unmarshal(value []byte) error { | |
| if unicode.IsDigit(r) { | ||
| buf.UnreadRune() | ||
| dateBytes = buf.Next(4) | ||
| date, err = parseDate(dateBytes, bookingYear) | ||
| if err != nil { | ||
| return errors.WithMessage(err, "unmarshal transaction tag: parsing booking date") | ||
| } | ||
| t.BookingDate = domain.NewShortDate(date) | ||
| diff := t.ValutaDate.Sub(t.BookingDate.Time).Hours() / 24 | ||
| if diff > 31 { | ||
|
There was a problem hiding this comment. Unfortunately I haven't yet understood what we're calculating here and why we're checking for 31. There was a problem hiding this comment. how may days can be between a booking and a valuta date? I am sure it us less then 31 days. There was a problem hiding this comment. regarding this thread https://homebanking-hilfe.de/forum/topic.php?t=8970 which may or may not be representative the number of days can be way higher |
||
| t.BookingDate = domain.NewShortDate(t.BookingDate.AddDate(1, 0, 0)) | ||
| } | ||
| } | ||
|
|
@@ -320,11 +320,24 @@ func parseDate(value []byte, referenceYear int) (time.Time, error) { | |
| yearBegin := fmt.Sprintf("%d", referenceYear)[:offset] | ||
| dateString := yearBegin + string(value) | ||
| date, err := time.Parse("20060102", dateString) | ||
|
|
||
| if err != nil { | ||
| if strings.HasSuffix(dateString, "0229") { | ||
| return time.Date(referenceYear, 2, 29, 0, 0, 0, 0, time.UTC), nil | ||
| } | ||
| return time.Time{}, err | ||
| } | ||
|
|
||
| diff := date.Year() - referenceYear | ||
| if diff == 100 { | ||
| return time.Date(referenceYear, date.Month(), date.Day(), 0, 0, 0, 0, time.UTC), nil | ||
| } | ||
| if diff == 99 { | ||
| return time.Date(referenceYear-1, date.Month(), date.Day(), 0, 0, 0, 0, time.UTC), nil | ||
| } | ||
| if diff == -99 { | ||
| return time.Date(referenceYear+1, date.Month(), date.Day(), 0, 0, 0, 0, time.UTC), nil | ||
|
|
||
| } | ||
| return date.Truncate(24 * time.Hour), nil | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
when I read it correctly you're using
ReferenceDateas a way for dependency injection. As the value is always hardcoded totime.Nowatelement.swift.go:30. What do you think about not exposing it yet and guarding against zero value within theUnmarshalmethod atswift/mt940_unmarshaler.go:12?