refactor: rename retention policy vars

Author: ItsNotGoodName

README.md

@@ -69,11 +69,11 @@ data_directory: smtpbridge_data
 # Retention policy for envelopes and attachment files
 retention:
   # # Retention policy for envelopes in database
-  # envelope_count: # (0, 100, 250, ...) [optional]
-  # envelope_age: # (5m, 5h45m, ...) [optional]
+  # envelope_count: # (0, 100, 250, ...)
+  # envelope_age: # (5m, 5h45m, ...)
 
   # # Retention policy for attachment files on disk
-  # attachment_size: # (100 MB, 1 GB, ...) [optional]
+  # attachment_size: # (100 MB, 1 GB, ...)
 
 # HTTP server
 http:

config/config.go

@@ -124,7 +124,7 @@ func Parse(raw Raw) (Config, error) {
 		EnvelopeCount:  raw.Retention.EnvelopeCount,
 		AttachmentSize: attachmentsSize,
 		EnvelopeAge:    envelopeAge,
-		MinEnvelopeAge: 5 * time.Minute,
+		MinAge:         5 * time.Minute,
 	}
 
 	return Config{

internal/models/retention.go

@@ -5,18 +5,18 @@ import (
 )
 
 type RetentionPolicy struct {
+	MinAge         time.Duration
 	EnvelopeCount  *int
 	EnvelopeAge    *time.Duration
-	MinEnvelopeAge time.Duration
 	AttachmentSize *int64
 }
 
-func (rp RetentionPolicy) EnvelopeAgeDate() time.Time {
+func (rp RetentionPolicy) AgeDate() time.Time {
 	date := time.Now()
-	if rp.EnvelopeAge != nil && *rp.EnvelopeAge > rp.MinEnvelopeAge {
+	if rp.EnvelopeAge != nil && *rp.EnvelopeAge > rp.MinAge {
 		date = date.Add(-*rp.EnvelopeAge)
 	} else {
-		date = date.Add(-rp.MinEnvelopeAge)
+		date = date.Add(-rp.MinAge)
 	}
 
 	return date

internal/procs/gardener.go

@@ -89,7 +89,7 @@ func gardenerDeleteByAttachmentSize(cc *core.Context, policy models.RetentionPol
 	attachmentSize := *policy.AttachmentSize
 
 	if storage.AttachmentSize > attachmentSize {
-		age := policy.EnvelopeAgeDate()
+		age := policy.AgeDate()
 		log.Info().Time("age", age).Msg("Deleting attachment files by attachment size retention policy")
 		err := files.DeleteFileUntilSize(cc, storage.AttachmentSize, attachmentSize, age)
 		if err != nil {
@@ -105,7 +105,7 @@ func gardenerDeleteByEnvelopeCount(cc *core.Context, policy models.RetentionPoli
 	envelopeCount := *policy.EnvelopeCount
 
 	if storage.EnvelopeCount > envelopeCount {
-		age := policy.EnvelopeAgeDate()
+		age := policy.AgeDate()
 		count, err := db.EnvelopeDeleteUntilCount(cc, envelopeCount, age)
 		if err != nil {
 			log.Err(err).Time("age", age).Int("keep", envelopeCount).Msg("Failed to envelopes by envelope count retention policy")
@@ -120,7 +120,7 @@ func gardenerDeleteByAge(cc *core.Context, policy models.RetentionPolicy) {
 		return
 	}
 
-	age := policy.EnvelopeAgeDate()
+	age := policy.AgeDate()
 	count, err := db.EnvelopeDeleteOlderThan(cc, age)
 	if err != nil {
 		log.Err(err).Time("age", age).Msg("Failed to delete envelopes by age retention policy")

web/views/index.html

@@ -28,23 +28,23 @@ <h2>Retention Policy</h2>
     <figure>
       <table>
         <tbody>
-          {{if .RetentionPolicy.EnvelopeCount}}
+          <tr>
+            <th scope="row"><strong>Minimum Age</strong></th>
+            <td>{{.RetentionPolicy.MinAge}}</td>
+          </tr>
+          {{if not (eq .RetentionPolicy.EnvelopeCount nil)}}
           <tr>
             <th scope="row"><strong>Envelope Count</strong></th>
             <td>{{.RetentionPolicy.EnvelopeCount}}</td>
           </tr>
           {{end}}
-          {{if .RetentionPolicy.EnvelopeAge}}
+          {{if not (eq .RetentionPolicy.EnvelopeAge nil)}}
           <tr>
             <th scope="row"><strong>Envelope Age</strong></th>
             <td>{{.RetentionPolicy.EnvelopeAge}}</td>
           </tr>
           {{end}}
-          <tr>
-            <th scope="row"><strong>Minimum Envelope Age</strong></th>
-            <td>{{.RetentionPolicy.MinEnvelopeAge}}</td>
-          </tr>
-          {{if .RetentionPolicy.AttachmentSize}}
+          {{if not (eq .RetentionPolicy.AttachmentSize nil)}}
           <tr>
             <th scope="row"><strong>Attachment Size</strong></th>
             <td>{{bytesHumanize .RetentionPolicy.AttachmentSize}}</td>