@molochko-dev/data 1.4.36 → 1.4.37
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
|
@@ -40,7 +40,9 @@ class AnimalEventFilter {
|
|
|
40
40
|
this.status.FRESH,
|
|
41
41
|
]);
|
|
42
42
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
43
|
-
|
|
43
|
+
if (genderOk && statusOk && ageOk) {
|
|
44
|
+
return animal;
|
|
45
|
+
}
|
|
44
46
|
});
|
|
45
47
|
return result;
|
|
46
48
|
}
|
|
@@ -49,7 +51,9 @@ class AnimalEventFilter {
|
|
|
49
51
|
const genderOk = this.genderFilter(animal, enums_1.ANIMAL_GENDER_ENUM.cow);
|
|
50
52
|
const statusOk = this.statusFilter(animal, [this.status.DRY, this.status.PREGNANT]);
|
|
51
53
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
52
|
-
|
|
54
|
+
if (genderOk && statusOk && ageOk) {
|
|
55
|
+
return animal;
|
|
56
|
+
}
|
|
53
57
|
});
|
|
54
58
|
return result;
|
|
55
59
|
}
|
|
@@ -67,7 +71,9 @@ class AnimalEventFilter {
|
|
|
67
71
|
}
|
|
68
72
|
}
|
|
69
73
|
const statusOk = this.statusFilter(animal, availableStatus);
|
|
70
|
-
|
|
74
|
+
if (genderOk && statusOk && ageOk) {
|
|
75
|
+
return animal;
|
|
76
|
+
}
|
|
71
77
|
});
|
|
72
78
|
return result;
|
|
73
79
|
}
|
|
@@ -79,7 +85,9 @@ class AnimalEventFilter {
|
|
|
79
85
|
const genderOk = this.genderFilter(animal, enums_1.ANIMAL_GENDER_ENUM.cow);
|
|
80
86
|
const statusOk = this.statusFilter(animal, [this.status.DRY]);
|
|
81
87
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
82
|
-
|
|
88
|
+
if (genderOk && statusOk && ageOk) {
|
|
89
|
+
return animal;
|
|
90
|
+
}
|
|
83
91
|
});
|
|
84
92
|
return result;
|
|
85
93
|
}
|
package/package.json
CHANGED
|
@@ -52,7 +52,9 @@ class AnimalEventFilter {
|
|
|
52
52
|
this.status.FRESH,
|
|
53
53
|
]);
|
|
54
54
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
55
|
-
|
|
55
|
+
if (genderOk && statusOk && ageOk) {
|
|
56
|
+
return animal;
|
|
57
|
+
}
|
|
56
58
|
});
|
|
57
59
|
|
|
58
60
|
return result;
|
|
@@ -64,7 +66,9 @@ class AnimalEventFilter {
|
|
|
64
66
|
const statusOk = this.statusFilter(animal, [this.status.DRY, this.status.PREGNANT]);
|
|
65
67
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
66
68
|
|
|
67
|
-
|
|
69
|
+
if (genderOk && statusOk && ageOk) {
|
|
70
|
+
return animal;
|
|
71
|
+
}
|
|
68
72
|
});
|
|
69
73
|
return result;
|
|
70
74
|
}
|
|
@@ -85,7 +89,9 @@ class AnimalEventFilter {
|
|
|
85
89
|
}
|
|
86
90
|
const statusOk = this.statusFilter(animal, availableStatus);
|
|
87
91
|
|
|
88
|
-
|
|
92
|
+
if (genderOk && statusOk && ageOk) {
|
|
93
|
+
return animal;
|
|
94
|
+
}
|
|
89
95
|
});
|
|
90
96
|
return result;
|
|
91
97
|
}
|
|
@@ -100,7 +106,9 @@ class AnimalEventFilter {
|
|
|
100
106
|
const statusOk = this.statusFilter(animal, [this.status.DRY]);
|
|
101
107
|
const ageOk = this.ageFilter(animal, this.defaultCowAge);
|
|
102
108
|
|
|
103
|
-
|
|
109
|
+
if (genderOk && statusOk && ageOk) {
|
|
110
|
+
return animal;
|
|
111
|
+
}
|
|
104
112
|
});
|
|
105
113
|
return result;
|
|
106
114
|
}
|