fixed entry is expired issue (fix: mxschmitt#120)

mxschmitt · mxschmitt · commit c5fa7314ef74 · 2018-08-21T11:50:17.000+02:00
diff --git a/internal/stores/store.go b/internal/stores/store.go
@@ -74,10 +74,9 @@ func (s *Store) GetEntryByID(id string) (*shared.Entry, error) {
 func (s *Store) GetEntryAndIncrease(id string) (*shared.Entry, error) {
 	entry, err := s.GetEntryByID(id)
 	if err != nil {
-		errors.Wrap(err, "could not fetch entry "+id)
-		return nil, err
+		return nil, errors.Wrap(err, "could not fetch entry "+id)
 	}
-	if entry.Public.Expiration != nil && time.Now().After(*entry.Public.Expiration) {
+	if entry.Public.Expiration != nil && !entry.Public.Expiration.IsZero() && time.Now().After(*entry.Public.Expiration) {
 		return nil, ErrEntryIsExpired
 	}
 	if err := s.storage.IncreaseVisitCounter(id); err != nil {

Original file line number	Diff line number	Diff line change
`@@ -74,10 +74,9 @@ func (s Store) GetEntryByID(id string) (shared.Entry, error) {`
`74`	`74`	`func (s Store) GetEntryAndIncrease(id string) (shared.Entry, error) {`
`75`	`75`	`entry, err := s.GetEntryByID(id)`
`76`	`76`	`if err != nil {`
`77`		`- errors.Wrap(err, "could not fetch entry "+id)`
`78`		`- return nil, err`
	`77`	`+ return nil, errors.Wrap(err, "could not fetch entry "+id)`
`79`	`78`	`}`
`80`		`- if entry.Public.Expiration != nil && time.Now().After(*entry.Public.Expiration) {`
	`79`	`+ if entry.Public.Expiration != nil && !entry.Public.Expiration.IsZero() && time.Now().After(*entry.Public.Expiration) {`
`81`	`80`	`return nil, ErrEntryIsExpired`
`82`	`81`	`}`
`83`	`82`	`if err := s.storage.IncreaseVisitCounter(id); err != nil {`