warning: estrusItems update

model/neck_ring_estrus_warning.go

@@ -110,11 +110,13 @@ func (n NeckRingEstrusWarningSlice) ToPB(
 					break
 				}
 			}
-		} else {
+		}
+
+		if matingWindowPeriodKind > pasturePb.MatingWindowPeriod_Invalid {
 			found = isIPeriod(matingWindowPeriodKind, nowTime, optimumMatingStartTime, optimumMatingEndTime)
 		}
 
-		if !found {
+		if found {
 			continue
 		}
 
@@ -155,11 +157,11 @@ func (n NeckRingEstrusWarningSlice) ToPB(
 func isIPeriod(periodKind pasturePb.MatingWindowPeriod_Kind, nowTime, optimumMatingStartTime, optimumMatingEndTime time.Time) bool {
 	switch periodKind {
 	case pasturePb.MatingWindowPeriod_Front:
-		return nowTime.Before(optimumMatingStartTime)
+		return !nowTime.Before(optimumMatingStartTime)
 	case pasturePb.MatingWindowPeriod_Middle:
-		return nowTime.After(optimumMatingStartTime) && nowTime.Before(optimumMatingEndTime)
+		return !(nowTime.After(optimumMatingStartTime) && nowTime.Before(optimumMatingEndTime))
 	case pasturePb.MatingWindowPeriod_Behind:
-		return nowTime.After(optimumMatingEndTime)
+		return !(nowTime.After(optimumMatingEndTime))
 	default:
 		return false
 	}