@molochko-dev/data 1.4.32 → 1.4.321

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.
package/src/enums.ts CHANGED
@@ -6,204 +6,230 @@ export const BCRYPT_SALT: number = 12;
6
6
  export enum SYSTEM_USER_ROLES_ENUM {
7
7
  user = "user",
8
8
  admin = "admin",
9
- root = "root"
9
+ root = "root",
10
10
  }
11
11
 
12
12
  export const SYSTEM_USER_ROLES_AS_OBJECT = enumToObject(SYSTEM_USER_ROLES_ENUM);
13
13
 
14
14
  export enum USER_STATUSES_ENUM {
15
- waiting = 'waiting',
16
- ready = 'ready',
17
- blocked = 'blocked',
18
- deleted = 'deleted'
15
+ waiting = "waiting",
16
+ ready = "ready",
17
+ blocked = "blocked",
18
+ deleted = "deleted",
19
19
  }
20
20
 
21
21
  export const USER_STATUSES_AS_OBJECT = enumToObject(USER_STATUSES_ENUM);
22
22
 
23
23
  export enum ORG_TYPE_ENUM {
24
- org = 'org',
25
- location = 'location',
24
+ org = "org",
25
+ location = "location",
26
26
  }
27
27
 
28
- export const ORG_TYPE_AS_OBJECT = enumToObject(ORG_TYPE_ENUM)
28
+ export const ORG_TYPE_AS_OBJECT = enumToObject(ORG_TYPE_ENUM);
29
29
 
30
30
  export enum TOKEN_TYPE_ENUM {
31
- confirm = 'confirm',
32
- auth = 'auth',
33
- refresh = 'refresh',
34
- resetPassword = 'resetPassword',
35
- invite = 'invite'
31
+ confirm = "confirm",
32
+ auth = "auth",
33
+ refresh = "refresh",
34
+ resetPassword = "resetPassword",
35
+ invite = "invite",
36
36
  }
37
37
 
38
38
  export const TOKEN_TYPES_AS_OBJECT = enumToObject(TOKEN_TYPE_ENUM);
39
39
 
40
40
  export enum ANIMAL_GENDER_ENUM {
41
- cow = 'cow',
42
- bull = 'bull'
41
+ cow = "cow",
42
+ bull = "bull",
43
43
  }
44
44
 
45
45
  export const ANIMAL_GENDER_AS_OBJECT = enumToObject(ANIMAL_GENDER_ENUM);
46
46
 
47
47
  export enum EVENT_TYPES_ENUM {
48
- otel = 'otel', // ОТЕЛ
49
- recheck = 'recheck', // ПЕРЕПРОВЕРИТЬ *
50
- ohota = 'ohota', // ОХОТА
51
- osemenenie = 'osemenenie', // ОСЕМЕНЕНИЕ *
52
- stelnaya = 'stelnaya', // СТЕЛЬНАЯ
53
- yalovaya = 'yalovaya', // ЯЛОВАЯ (НЕ СТЕЛЬНАЯ)
54
- stelneotpos = 'stelneotpos', // СТЕЛЬНАЯ НЕ ОТ ПОС ОСЕМЕНЕНИЯ
55
- perevod = 'perevod', // ПЕРЕВОД
56
- kbiku = 'kbiku', // КБЫКУ
57
- suhostoi = 'suhostoi', //'СУХОСТОЙ
58
- abort = 'abort', // АБОРТ
59
- neosem = 'neosem', // НЕОСЕМ (БРАК) *
60
- prodazha = 'prodazha', // ПРОДАЖА
61
- pala = 'pala', // ПАЛА
62
- zamenaNomera = 'zamenaNomera', // ЗАМЕНА НОМЕРА
63
- obrKopit = 'obrKopit', // ОБРАБОТКА КОПЫТ
64
- pozSuhostoi = 'pozSuhostoi', // ПОЗСУХОСТОЙ
65
- ves = 'ves', // ВЕС
66
- rost = 'rost', // РОСТ
67
- upitannost = 'upitannost', // УПИТАННОСТЬ
68
- zaboi = 'zaboi', // ЗАБОЙ
69
- sinchronizatsia = 'sinchronizatsia', // СИНХРОНИЗАЦИЯ
70
- transferOut = 'transferOut', // выбытие
48
+ otel = "otel", // ОТЕЛ
49
+ recheck = "recheck", // ПЕРЕПРОВЕРИТЬ *
50
+ ohota = "ohota", // ОХОТА
51
+ osemenenie = "osemenenie", // ОСЕМЕНЕНИЕ *
52
+ stelnaya = "stelnaya", // СТЕЛЬНАЯ
53
+ yalovaya = "yalovaya", // ЯЛОВАЯ (НЕ СТЕЛЬНАЯ)
54
+ stelneotpos = "stelneotpos", // СТЕЛЬНАЯ НЕ ОТ ПОС ОСЕМЕНЕНИЯ
55
+ perevod = "perevod", // ПЕРЕВОД
56
+ kbiku = "kbiku", // КБЫКУ
57
+ suhostoi = "suhostoi", //'СУХОСТОЙ
58
+ abort = "abort", // АБОРТ
59
+ neosem = "neosem", // НЕОСЕМ (БРАК) *
60
+ prodazha = "prodazha", // ПРОДАЖА
61
+ pala = "pala", // ПАЛА
62
+ zamenaNomera = "zamenaNomera", // ЗАМЕНА НОМЕРА
63
+ obrKopit = "obrKopit", // ОБРАБОТКА КОПЫТ
64
+ pozSuhostoi = "pozSuhostoi", // ПОЗСУХОСТОЙ
65
+ ves = "ves", // ВЕС
66
+ rost = "rost", // РОСТ
67
+ upitannost = "upitannost", // УПИТАННОСТЬ
68
+ zaboi = "zaboi", // ЗАБОЙ
69
+ sinchronizatsia = "sinchronizatsia", // СИНХРОНИЗАЦИЯ
70
+ transferOut = "transferOut", // выбытие
71
71
  }
72
72
 
73
73
  export const EVENT_TYPES_AS_OBJECT = enumToObject(EVENT_TYPES_ENUM);
74
74
 
75
75
  export enum SEED_TYPE_ENUM {
76
- traditional = 'traditional', // Традиционное
77
- sexytelka = 'sexytelka', // Сексированное телка
78
- sexybull = 'sexybull', // Сексированное бычок
79
- meat = 'meat', // Мясное
80
- meatSexyTelka = 'meatSexyTelka', // Мясное сексированное телка
81
- meatSexyBull = 'meatSexyBull', // Мясное сексированное бычок
76
+ traditional = "traditional", // Традиционное
77
+ sexytelka = "sexytelka", // Сексированное телка
78
+ sexybull = "sexybull", // Сексированное бычок
79
+ meat = "meat", // Мясное
80
+ meatSexyTelka = "meatSexyTelka", // Мясное сексированное телка
81
+ meatSexyBull = "meatSexyBull", // Мясное сексированное бычок
82
82
  }
83
83
 
84
84
  export const SEED_TYPE_AS_OBJECT = enumToObject(SEED_TYPE_ENUM);
85
85
 
86
86
  export enum SEED_STATUS_ENUM {
87
- active = 'active',
88
- notActive = 'notActive'
87
+ active = "active",
88
+ notActive = "notActive",
89
89
  }
90
90
 
91
91
  export const SEED_STATUS_AS_OBJECT = enumToObject(SEED_STATUS_ENUM);
92
92
 
93
93
  export enum SEED_CODES_ENUM {
94
- DOUBLE_OVSYNC = 'doubleOvsync',
95
- PRESYNC = 'dresync',
96
- RESYNC = 'resync',
97
- OVSYNC = 'ovsync',
98
- HEAT = 'heat',
99
- ACTIVITY_SENSOR = 'activitySensor',
100
- PRID_DELTA = 'PRIDDelta',
101
- G6G = 'G6G',
94
+ DOUBLE_OVSYNC = "doubleOvsync",
95
+ PRESYNC = "dresync",
96
+ RESYNC = "resync",
97
+ OVSYNC = "ovsync",
98
+ HEAT = "heat",
99
+ ACTIVITY_SENSOR = "activitySensor",
100
+ PRID_DELTA = "PRIDDelta",
101
+ G6G = "G6G",
102
102
  }
103
103
 
104
104
  export const SEED_CODES_AS_OBJECT = enumToObject(SEED_CODES_ENUM);
105
105
 
106
106
  export enum ANIMAL_STATUS_ENUM {
107
- heifer = 'heifer', // Телка
108
- bred = 'bred', // Осемененная
109
- pregnant = 'pregnant', // Стельная
110
- open = 'open', // Яловая
111
- fresh = 'fresh', // Новотельная
112
- dry = 'dry', // Сухостой
113
- dnb = 'dnb', // Брак
114
- sold = 'sold', // Продана
115
- died = 'died', // Сдохла
116
- theft = 'theft', // Кража
117
- transferout = 'transferout' // выбыла
107
+ heifer = "heifer", // Телка
108
+ bred = "bred", // Осемененная
109
+ pregnant = "pregnant", // Стельная
110
+ open = "open", // Яловая
111
+ fresh = "fresh", // Новотельная
112
+ dry = "dry", // Сухостой
113
+ dnb = "dnb", // Брак
114
+ sold = "sold", // Продана
115
+ died = "died", // Сдохла
116
+ theft = "theft", // Кража
117
+ transferout = "transferout", // выбыла
118
+ }
119
+
120
+ export enum BULL_STATUS {
121
+ SOLD = "sold",
122
+ BULL = "bull",
123
+ DIED = "died",
124
+ }
125
+
126
+ export enum COW_STATUS {
127
+ HEIFER = "heifer",
128
+ BRED = "bred",
129
+ PREGNANT = "pregnant",
130
+ OPEN = "open",
131
+ FRESH = "fresh",
132
+ DRY = "dry",
133
+ DNB = "dnb",
134
+ SOLD = "sold",
135
+ DIED = "died",
118
136
  }
119
137
 
120
138
  export const ANIMAL_STATUS_AS_OBJECT = enumToObject(ANIMAL_STATUS_ENUM);
121
139
 
122
140
  // heifer, bred, open, fresh
123
141
  export enum EVENT_ERROR_REASON_ENUM {
124
- statusNotAllowed = 'animal-status-not-allowed',
125
- statusNotAllowedPregnant = 'animal-status-not-allowed-pregnant',
126
- statusNotAllowedDry = 'animal-status-not-allowed-dry',
127
- statusNotAllowedDnb = 'animal-status-not-allowed-dnb',
128
- statusNotAllowedSold = 'animal-status-not-allowed-sold',
129
- statusNotAllowedDied = 'animal-status-not-allowed-died',
130
- statusNotAllowedBred = 'animal-status-not-allowed-bred',
131
- statusNotAllowedFresh = 'animal-status-not-allowed-fresh',
132
- statusNotAllowedHeifer = 'animal-status-not-allowed-heifer',
133
- statusNotAllowedOpen = 'animal-status-not-allowed-open',
134
- statusForFirstRecheckBredOnly = 'animal-status-for-first-recheck-bred-only',
135
- notACow = 'animal-not-a-cow',
136
- tooYoung = 'animal-too-young'
137
- }
138
-
139
- export const EVENT_ERROR_REASON_AS_OBJECT = enumToObject(EVENT_ERROR_REASON_ENUM);
142
+ statusNotAllowed = "animal-status-not-allowed",
143
+ statusNotAllowedPregnant = "animal-status-not-allowed-pregnant",
144
+ statusNotAllowedDry = "animal-status-not-allowed-dry",
145
+ statusNotAllowedDnb = "animal-status-not-allowed-dnb",
146
+ statusNotAllowedSold = "animal-status-not-allowed-sold",
147
+ statusNotAllowedDied = "animal-status-not-allowed-died",
148
+ statusNotAllowedBred = "animal-status-not-allowed-bred",
149
+ statusNotAllowedFresh = "animal-status-not-allowed-fresh",
150
+ statusNotAllowedHeifer = "animal-status-not-allowed-heifer",
151
+ statusNotAllowedOpen = "animal-status-not-allowed-open",
152
+ statusForFirstRecheckBredOnly = "animal-status-for-first-recheck-bred-only",
153
+ notACow = "animal-not-a-cow",
154
+ tooYoung = "animal-too-young",
155
+ }
156
+
157
+ export const EVENT_ERROR_REASON_AS_OBJECT = enumToObject(
158
+ EVENT_ERROR_REASON_ENUM
159
+ );
140
160
 
141
161
  export enum COMMON_SIMPLE_STATUS_ENUM {
142
- failed = 'failed',
143
- success = 'success'
162
+ failed = "failed",
163
+ success = "success",
144
164
  }
145
165
 
146
- export const COMMON_SIMPLE_STATUS_AS_OBJECT = enumToObject(COMMON_SIMPLE_STATUS_ENUM);
166
+ export const COMMON_SIMPLE_STATUS_AS_OBJECT = enumToObject(
167
+ COMMON_SIMPLE_STATUS_ENUM
168
+ );
147
169
 
148
170
  export enum TAG_TYPE_ENUM {
149
- user = 'user',
150
- system = 'system',
151
- event = 'event'
171
+ user = "user",
172
+ system = "system",
173
+ event = "event",
152
174
  }
153
175
 
154
176
  export const TAG_TYPE_AS_OBJECT = enumToObject(TAG_TYPE_ENUM);
155
177
 
156
178
  export enum USER_PERMISSION_ENUM {
157
- view = 'view',
158
- create = 'create',
159
- update = 'update',
160
- delete = 'delete',
161
- deleteAll = 'deleteAll',
162
- attach = "attach",
163
- detach = "detach"
179
+ view = "view",
180
+ create = "create",
181
+ update = "update",
182
+ delete = "delete",
183
+ deleteAll = "deleteAll",
184
+ attach = "attach",
185
+ detach = "detach",
164
186
  }
165
187
 
166
188
  export const USER_PERMISSION_AS_OBJECT = enumToObject(USER_PERMISSION_ENUM);
167
189
 
168
190
  export enum USER_PERMISSION_METHOD_ENUM {
169
- post = 'POST',
170
- put = 'PUT',
171
- delete = 'DELETE',
172
- get = 'GET',
173
- patch = 'PATCH'
191
+ post = "POST",
192
+ put = "PUT",
193
+ delete = "DELETE",
194
+ get = "GET",
195
+ patch = "PATCH",
174
196
  }
175
197
 
176
- export const USER_PERMISSION_METHOD_AS_OBJECT = enumToObject(USER_PERMISSION_METHOD_ENUM);
198
+ export const USER_PERMISSION_METHOD_AS_OBJECT = enumToObject(
199
+ USER_PERMISSION_METHOD_ENUM
200
+ );
177
201
 
178
202
  export enum ACCESS_ENUM {
179
- read = 'read',
180
- write = 'write',
203
+ read = "read",
204
+ write = "write",
181
205
  }
182
206
 
183
207
  export const ACCESS_ENUM_AS_OBJECT = enumToObject(ACCESS_ENUM);
184
208
 
185
209
  export enum TRANSFEROUT_TYPES_ENUM {
186
- transferOut = 'transferOut',
187
- died = 'died',
210
+ transferOut = "transferOut",
211
+ died = "died",
188
212
  }
189
213
 
190
214
  export const TRANSFEROUT_TYPES_AS_OBJECT = enumToObject(TRANSFEROUT_TYPES_ENUM);
191
215
 
192
216
  export enum TRANSFEROUT_REASON_ENUM {
193
- leikoz = 'leikoz', // Лейкоз
194
- tuberkulez = 'tuberkulez', // Туберкулез
195
- klostirikoz = 'klostirikoz', // Клостридиоз
196
- nekrobacilez = 'nekrobacilez', // Некробациллез
197
- aktinomikoz = 'aktinomikoz', // Актиномикоз)
198
- ginekologic = 'ginekologic', // Гинекологические заболевания
199
- metabolicDisorders = 'metabolicDisorders', // Нарушения обмена веществ
200
- Infertility = 'infertility', // Бесплодие
201
- udderDiseases = 'udderDiseases', // Болезни вымени
202
- lameness = 'lameness', // Хромота
203
- breedingSales = 'breedingSales', // Племпродажа
204
- salesToThePublic = 'salesToThePublic' , // Продажа населению
205
- theft = 'theft', // Кража
206
- dead = 'dead', // сдохла
207
- }
208
-
209
- export const TRANSFEROUT_REASON_AS_OBJECT = enumToObject(TRANSFEROUT_REASON_ENUM);
217
+ leikoz = "leikoz", // Лейкоз
218
+ tuberkulez = "tuberkulez", // Туберкулез
219
+ klostirikoz = "klostirikoz", // Клостридиоз
220
+ nekrobacilez = "nekrobacilez", // Некробациллез
221
+ aktinomikoz = "aktinomikoz", // Актиномикоз)
222
+ ginekologic = "ginekologic", // Гинекологические заболевания
223
+ metabolicDisorders = "metabolicDisorders", // Нарушения обмена веществ
224
+ Infertility = "infertility", // Бесплодие
225
+ udderDiseases = "udderDiseases", // Болезни вымени
226
+ lameness = "lameness", // Хромота
227
+ breedingSales = "breedingSales", // Племпродажа
228
+ salesToThePublic = "salesToThePublic", // Продажа населению
229
+ theft = "theft", // Кража
230
+ dead = "dead", // сдохла
231
+ }
232
+
233
+ export const TRANSFEROUT_REASON_AS_OBJECT = enumToObject(
234
+ TRANSFEROUT_REASON_ENUM
235
+ );
@@ -1,10 +1,15 @@
1
- import { IAbstractAnimal, IAnimal } from '../types';
2
- import { ANIMAL_GENDER_ENUM, ANIMAL_STATUS_ENUM, EVENT_TYPES_ENUM } from '../enums';
3
- import { getMonthFromDate } from '../helpers/date';
1
+ import { AnimalStatus, BaseAnimal } from "../types";
2
+ import {
3
+ ANIMAL_GENDER_ENUM,
4
+ ANIMAL_STATUS_ENUM,
5
+ COW_STATUS,
6
+ EVENT_TYPES_ENUM,
7
+ } from "../enums";
8
+ import { getMonthFromDate } from "../helpers/date";
4
9
 
5
- const status = ANIMAL_STATUS_ENUM
10
+ const status = COW_STATUS;
6
11
 
7
- const defaultCowAge = 12
12
+ const defaultCowAge = 12;
8
13
 
9
14
  /*
10
15
 
@@ -12,115 +17,134 @@ const filtered = filter(animals, eventType)
12
17
 
13
18
  */
14
19
 
15
- function ageFilter<T extends IAbstractAnimal> (animal: T, availableMinAge: number /*month*/): Boolean {
16
- const months = getMonthFromDate(animal.dob.toISOString())
17
- return months > availableMinAge
20
+ function ageFilter<T extends BaseAnimal>(
21
+ animal: T,
22
+ availableMinAge: number /*month*/
23
+ ): boolean {
24
+ const months = getMonthFromDate(animal.dob.toISOString());
25
+ return months > availableMinAge;
18
26
  }
19
27
 
20
- function statusFilter<T extends IAbstractAnimal> (animal: T, availableStatuses: ANIMAL_STATUS_ENUM[]): Boolean {
21
- return availableStatuses.includes(animal.status)
28
+ function statusFilter<T extends BaseAnimal>(
29
+ animal: T,
30
+ availableStatuses: AnimalStatus[]
31
+ ): boolean {
32
+ return availableStatuses.includes(animal.status);
22
33
  }
23
34
 
24
- function genderFilter<T extends IAbstractAnimal> (animal: T, availableGender: ANIMAL_GENDER_ENUM): Boolean {
25
- return animal.gender === availableGender
35
+ function genderFilter<T extends BaseAnimal>(
36
+ animal: T,
37
+ availableGender: ANIMAL_GENDER_ENUM
38
+ ): boolean {
39
+ return animal.gender === availableGender;
26
40
  }
27
41
 
28
- function abortFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
29
- const result: T[] = animals.filter(animal => genderFilter<T>(animal, ANIMAL_GENDER_ENUM.cow))
30
- return result
42
+ function abortFilter<T extends BaseAnimal>(animals: T[]): T[] {
43
+ const result: T[] = animals.filter((animal) =>
44
+ genderFilter<T>(animal, ANIMAL_GENDER_ENUM.cow)
45
+ );
46
+ return result;
31
47
  }
32
48
 
33
- function neosemFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
34
- return abortFilter(animals)
49
+ function neosemFilter<T extends BaseAnimal>(animals: T[]): T[] {
50
+ return abortFilter(animals);
35
51
  }
36
52
 
37
- function osemenenieFilter<T extends IAbstractAnimal>(animals: T[]): T[] {
38
- const result = animals.filter(animal => {
39
- const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow)
40
- const statusOk = statusFilter(animal, [status.heifer, status.bred, status.open, status.fresh])
41
- const ageOk = ageFilter(animal, defaultCowAge)
42
-
43
- return genderOk && statusOk && ageOk && animal
44
- })
45
-
46
- return result
53
+ function osemenenieFilter<T extends BaseAnimal>(animals: T[]): T[] {
54
+ const result = animals.filter((animal) => {
55
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
56
+ const statusOk = statusFilter(animal, [
57
+ status.HEIFER,
58
+ status.BRED,
59
+ status.OPEN,
60
+ status.FRESH,
61
+ ]);
62
+ const ageOk = ageFilter(animal, defaultCowAge);
63
+
64
+ return genderOk && statusOk && ageOk && animal;
65
+ });
66
+
67
+ return result;
47
68
  }
48
69
 
49
- function otelFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
50
- const result = animals.filter(animal => {
51
- const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow)
52
- const statusOk = statusFilter(animal, [status.dry, status.pregnant])
53
- const ageOk = ageFilter(animal, defaultCowAge)
70
+ function otelFilter<T extends BaseAnimal>(animals: T[]): T[] {
71
+ const result = animals.filter((animal) => {
72
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
73
+ const statusOk = statusFilter(animal, [status.DRY, status.PREGNANT]);
74
+ const ageOk = ageFilter(animal, defaultCowAge);
54
75
 
55
- return genderOk && statusOk && ageOk && animal
56
- })
57
- return result
76
+ return genderOk && statusOk && ageOk && animal;
77
+ });
78
+ return result;
58
79
  }
59
80
 
60
- function recheckFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
61
- const result = animals.filter(animal => {
62
- const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow)
63
- const ageOk = ageFilter(animal, defaultCowAge)
64
-
65
- let availableStatus = [status.bred, status.pregnant, status.dry]
66
- if (animal.animalEventRelation) {
67
- const previousRechecks = animal.animalEventRelation.filter((row) => {
68
- return row.eventDetail.type === EVENT_TYPES_ENUM.recheck
69
- })
70
- if (previousRechecks.length == 0) {
71
- availableStatus = [status.bred]
72
- }
73
- }
74
- const statusOk = statusFilter(animal, availableStatus)
75
-
76
- return genderOk && statusOk && ageOk && animal
77
- })
78
- return result
81
+ function recheckFilter<T extends BaseAnimal>(animals: T[]): T[] {
82
+ const result = animals.filter((animal) => {
83
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
84
+ const ageOk = ageFilter(animal, defaultCowAge);
85
+
86
+ let availableStatus = [status.BRED, status.PREGNANT, status.DRY];
87
+ if (animal.animalEventRelation) {
88
+ const previousRechecks = animal.animalEventRelation.filter((row) => {
89
+ return row.eventDetail.type === EVENT_TYPES_ENUM.recheck;
90
+ });
91
+ if (previousRechecks.length == 0) {
92
+ availableStatus = [status.BRED];
93
+ }
94
+ }
95
+ const statusOk = statusFilter(animal, availableStatus);
96
+
97
+ return genderOk && statusOk && ageOk && animal;
98
+ });
99
+ return result;
79
100
  }
80
101
 
81
- function suhostoiFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
82
- return abortFilter(animals)
102
+ function suhostoiFilter<T extends BaseAnimal>(animals: T[]): T[] {
103
+ return abortFilter(animals);
83
104
  }
84
105
 
85
- function pozSuhostoiFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
86
- const result = animals.filter(animal => {
87
- const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow)
88
- const statusOk = statusFilter(animal, [status.dry])
89
- const ageOk = ageFilter(animal, defaultCowAge)
106
+ function pozSuhostoiFilter<T extends BaseAnimal>(animals: T[]): T[] {
107
+ const result = animals.filter((animal) => {
108
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
109
+ const statusOk = statusFilter(animal, [status.DRY]);
110
+ const ageOk = ageFilter(animal, defaultCowAge);
90
111
 
91
- return genderOk && statusOk && ageOk && animal
92
- })
93
- return result
112
+ return genderOk && statusOk && ageOk && animal;
113
+ });
114
+ return result;
94
115
  }
95
116
 
96
- function transferOutFilter<T extends IAbstractAnimal> (animals: T[]): T[] {
97
- return animals
117
+ function transferOutFilter<T extends BaseAnimal>(animals: T[]): T[] {
118
+ return animals;
98
119
  }
99
120
 
100
- function perevodFilter<T extends IAbstractAnimal> (animals: T[]) {
101
- return animals
121
+ function perevodFilter<T extends BaseAnimal>(animals: T[]) {
122
+ return animals;
102
123
  }
103
124
 
104
- interface IFilters<T extends IAbstractAnimal> {
105
- [key: string]: (animals: T[]) => T[]
125
+ interface IFilters<T extends BaseAnimal> {
126
+ [key: string]: (animals: T[]) => T[];
106
127
  }
107
128
 
108
- export function filter<T extends IAbstractAnimal>(animals: T[], eventType: EVENT_TYPES_ENUM) {
109
- const filters: IFilters<T> = {
110
- [EVENT_TYPES_ENUM.abort]: abortFilter,
111
- [EVENT_TYPES_ENUM.neosem]: neosemFilter,
112
- [EVENT_TYPES_ENUM.osemenenie]: osemenenieFilter,
113
- [EVENT_TYPES_ENUM.otel]: otelFilter,
114
- [EVENT_TYPES_ENUM.recheck]: recheckFilter,
115
- [EVENT_TYPES_ENUM.suhostoi]: suhostoiFilter,
116
- [EVENT_TYPES_ENUM.pozSuhostoi]: pozSuhostoiFilter,
117
- [EVENT_TYPES_ENUM.perevod]: perevodFilter,
118
- [EVENT_TYPES_ENUM.transferOut]: transferOutFilter
119
- }
120
- try {
121
- const result = filters[eventType](animals)
122
- return result
123
- } catch (err) {
124
- throw new Error(`AnimalForEventFilter.filter.${eventType} not implemented`)
125
- }
129
+ export function filter<T extends BaseAnimal>(
130
+ animals: T[],
131
+ eventType: EVENT_TYPES_ENUM
132
+ ) {
133
+ const filters: IFilters<T> = {
134
+ [EVENT_TYPES_ENUM.abort]: abortFilter,
135
+ [EVENT_TYPES_ENUM.neosem]: neosemFilter,
136
+ [EVENT_TYPES_ENUM.osemenenie]: osemenenieFilter,
137
+ [EVENT_TYPES_ENUM.otel]: otelFilter,
138
+ [EVENT_TYPES_ENUM.recheck]: recheckFilter,
139
+ [EVENT_TYPES_ENUM.suhostoi]: suhostoiFilter,
140
+ [EVENT_TYPES_ENUM.pozSuhostoi]: pozSuhostoiFilter,
141
+ [EVENT_TYPES_ENUM.perevod]: perevodFilter,
142
+ [EVENT_TYPES_ENUM.transferOut]: transferOutFilter,
143
+ };
144
+ try {
145
+ const result = filters[eventType](animals);
146
+ return result;
147
+ } catch (err) {
148
+ throw new Error(`AnimalForEventFilter.filter.${eventType} not implemented`);
149
+ }
126
150
  }
@@ -1,3 +1,3 @@
1
- import { filter as _filter } from './animal-event-filter'
1
+ import { filter as _filter } from "./animal-event-filter";
2
2
 
3
- export { _filter as filter }
3
+ export { _filter as filter };
@@ -1,6 +1,6 @@
1
- import moment from 'moment'
1
+ import moment from "moment";
2
2
 
3
3
  export const getMonthFromDate = (dateString: string) => {
4
- const result = moment().diff(dateString, 'months')
5
- return result
6
- }
4
+ const result = moment().diff(dateString, "months");
5
+ return result;
6
+ };
package/src/helpers.ts CHANGED
@@ -12,18 +12,17 @@ export function asObject(arrayOfObjects: EnumItem[]): EnumArrayAsObject {
12
12
 
13
13
  export function enumToObject(e: object): { [key: string]: string } {
14
14
  // { [key: string]: string };
15
- const result = Object.keys(e)
16
- .reduce((obj, key) => {
17
- // TypeScript перечисления имеют обратные свойства для обеспечения обратной совместимости
18
- // Проверяем, что ключ является числом и пропускаем эти ключи
19
- if (!isNaN(Number(key))) {
20
- return obj;
21
- }
22
-
23
- // @ts-ignore
24
- obj[key] = e[key];
15
+ const result = Object.keys(e).reduce((obj, key) => {
16
+ // TypeScript перечисления имеют обратные свойства для обеспечения обратной совместимости
17
+ // Проверяем, что ключ является числом и пропускаем эти ключи
18
+ if (!isNaN(Number(key))) {
25
19
  return obj;
26
- }, {});
20
+ }
21
+
22
+ // @ts-ignore
23
+ obj[key] = e[key];
24
+ return obj;
25
+ }, {});
27
26
 
28
- return result
29
- }
27
+ return result;
28
+ }