@molochko-dev/data 1.4.31 → 1.4.33

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
@@ -1,12 +1,11 @@
1
- import { EnumItem } from "./types";
2
- import { asObject, enumToObject } from "./helpers";
1
+ import { enumToObject } from './helpers';
3
2
 
4
3
  export const BCRYPT_SALT: number = 12;
5
4
 
6
5
  export enum SYSTEM_USER_ROLES_ENUM {
7
- user = "user",
8
- admin = "admin",
9
- root = "root"
6
+ user = 'user',
7
+ admin = 'admin',
8
+ root = 'root',
10
9
  }
11
10
 
12
11
  export const SYSTEM_USER_ROLES_AS_OBJECT = enumToObject(SYSTEM_USER_ROLES_ENUM);
@@ -15,7 +14,7 @@ export enum USER_STATUSES_ENUM {
15
14
  waiting = 'waiting',
16
15
  ready = 'ready',
17
16
  blocked = 'blocked',
18
- deleted = 'deleted'
17
+ deleted = 'deleted',
19
18
  }
20
19
 
21
20
  export const USER_STATUSES_AS_OBJECT = enumToObject(USER_STATUSES_ENUM);
@@ -25,21 +24,21 @@ export enum ORG_TYPE_ENUM {
25
24
  location = 'location',
26
25
  }
27
26
 
28
- export const ORG_TYPE_AS_OBJECT = enumToObject(ORG_TYPE_ENUM)
27
+ export const ORG_TYPE_AS_OBJECT = enumToObject(ORG_TYPE_ENUM);
29
28
 
30
29
  export enum TOKEN_TYPE_ENUM {
31
30
  confirm = 'confirm',
32
31
  auth = 'auth',
33
32
  refresh = 'refresh',
34
33
  resetPassword = 'resetPassword',
35
- invite = 'invite'
34
+ invite = 'invite',
36
35
  }
37
36
 
38
37
  export const TOKEN_TYPES_AS_OBJECT = enumToObject(TOKEN_TYPE_ENUM);
39
38
 
40
39
  export enum ANIMAL_GENDER_ENUM {
41
40
  cow = 'cow',
42
- bull = 'bull'
41
+ bull = 'bull',
43
42
  }
44
43
 
45
44
  export const ANIMAL_GENDER_AS_OBJECT = enumToObject(ANIMAL_GENDER_ENUM);
@@ -85,7 +84,7 @@ export const SEED_TYPE_AS_OBJECT = enumToObject(SEED_TYPE_ENUM);
85
84
 
86
85
  export enum SEED_STATUS_ENUM {
87
86
  active = 'active',
88
- notActive = 'notActive'
87
+ notActive = 'notActive',
89
88
  }
90
89
 
91
90
  export const SEED_STATUS_AS_OBJECT = enumToObject(SEED_STATUS_ENUM);
@@ -113,8 +112,26 @@ export enum ANIMAL_STATUS_ENUM {
113
112
  dnb = 'dnb', // Брак
114
113
  sold = 'sold', // Продана
115
114
  died = 'died', // Сдохла
116
- theft = 'theft', // Кража
117
- transferout = 'transferout' // выбыла
115
+ theft = 'theft', // Кража
116
+ transferout = 'transferout', // выбыла
117
+ }
118
+
119
+ export enum BULL_STATUS {
120
+ SOLD = 'sold',
121
+ BULL = 'bull',
122
+ DIED = 'died',
123
+ }
124
+
125
+ export enum COW_STATUS {
126
+ HEIFER = 'heifer',
127
+ BRED = 'bred',
128
+ PREGNANT = 'pregnant',
129
+ OPEN = 'open',
130
+ FRESH = 'fresh',
131
+ DRY = 'dry',
132
+ DNB = 'dnb',
133
+ SOLD = 'sold',
134
+ DIED = 'died',
118
135
  }
119
136
 
120
137
  export const ANIMAL_STATUS_AS_OBJECT = enumToObject(ANIMAL_STATUS_ENUM);
@@ -133,14 +150,14 @@ export enum EVENT_ERROR_REASON_ENUM {
133
150
  statusNotAllowedOpen = 'animal-status-not-allowed-open',
134
151
  statusForFirstRecheckBredOnly = 'animal-status-for-first-recheck-bred-only',
135
152
  notACow = 'animal-not-a-cow',
136
- tooYoung = 'animal-too-young'
153
+ tooYoung = 'animal-too-young',
137
154
  }
138
155
 
139
156
  export const EVENT_ERROR_REASON_AS_OBJECT = enumToObject(EVENT_ERROR_REASON_ENUM);
140
157
 
141
158
  export enum COMMON_SIMPLE_STATUS_ENUM {
142
159
  failed = 'failed',
143
- success = 'success'
160
+ success = 'success',
144
161
  }
145
162
 
146
163
  export const COMMON_SIMPLE_STATUS_AS_OBJECT = enumToObject(COMMON_SIMPLE_STATUS_ENUM);
@@ -148,7 +165,7 @@ export const COMMON_SIMPLE_STATUS_AS_OBJECT = enumToObject(COMMON_SIMPLE_STATUS_
148
165
  export enum TAG_TYPE_ENUM {
149
166
  user = 'user',
150
167
  system = 'system',
151
- event = 'event'
168
+ event = 'event',
152
169
  }
153
170
 
154
171
  export const TAG_TYPE_AS_OBJECT = enumToObject(TAG_TYPE_ENUM);
@@ -159,18 +176,18 @@ export enum USER_PERMISSION_ENUM {
159
176
  update = 'update',
160
177
  delete = 'delete',
161
178
  deleteAll = 'deleteAll',
162
- attach = "attach",
163
- detach = "detach"
179
+ attach = 'attach',
180
+ detach = 'detach',
164
181
  }
165
182
 
166
183
  export const USER_PERMISSION_AS_OBJECT = enumToObject(USER_PERMISSION_ENUM);
167
184
 
168
185
  export enum USER_PERMISSION_METHOD_ENUM {
169
- post = 'POST',
170
- put = 'PUT',
171
- delete = 'DELETE',
172
- get = 'GET',
173
- patch = 'PATCH'
186
+ post = 'POST',
187
+ put = 'PUT',
188
+ delete = 'DELETE',
189
+ get = 'GET',
190
+ patch = 'PATCH',
174
191
  }
175
192
 
176
193
  export const USER_PERMISSION_METHOD_AS_OBJECT = enumToObject(USER_PERMISSION_METHOD_ENUM);
@@ -201,8 +218,8 @@ export enum TRANSFEROUT_REASON_ENUM {
201
218
  udderDiseases = 'udderDiseases', // Болезни вымени
202
219
  lameness = 'lameness', // Хромота
203
220
  breedingSales = 'breedingSales', // Племпродажа
204
- salesToThePublic = 'salesToThePublic' , // Продажа населению
205
- theft = 'theft', // Кража
221
+ salesToThePublic = 'salesToThePublic', // Продажа населению
222
+ theft = 'theft', // Кража
206
223
  dead = 'dead', // сдохла
207
224
  }
208
225
 
@@ -1,10 +1,10 @@
1
- import { IAnimal } from '../types';
2
- import { ANIMAL_GENDER_ENUM, ANIMAL_STATUS_ENUM, EVENT_TYPES_ENUM } from '../enums';
1
+ import { AnimalStatus, BaseAnimal } from '../types';
2
+ import { ANIMAL_GENDER_ENUM, COW_STATUS, EVENT_TYPES_ENUM } from '../enums';
3
3
  import { getMonthFromDate } from '../helpers/date';
4
4
 
5
- const status = ANIMAL_STATUS_ENUM
5
+ const status = COW_STATUS;
6
6
 
7
- const defaultCowAge = 12
7
+ const defaultCowAge = 12;
8
8
 
9
9
  /*
10
10
 
@@ -12,116 +12,118 @@ const filtered = filter(animals, eventType)
12
12
 
13
13
  */
14
14
 
15
- function genderFilter (animal: IAnimal, availableGender: ANIMAL_GENDER_ENUM): Boolean {
16
- return animal.gender === availableGender
15
+ function ageFilter<T extends BaseAnimal>(animal: T, availableMinAge: number /*month*/): boolean {
16
+ const months = getMonthFromDate(animal.dob.toISOString());
17
+ return months > availableMinAge;
17
18
  }
18
19
 
19
- function ageFilter (animal: IAnimal, availableMinAge: number /*month*/): Boolean {
20
- const months = getMonthFromDate(animal.dob.toISOString())
21
- return months > availableMinAge
20
+ function statusFilter<T extends BaseAnimal>(animal: T, availableStatuses: AnimalStatus[]): boolean {
21
+ return availableStatuses.includes(animal.status);
22
22
  }
23
23
 
24
- function statusFilter (animal: IAnimal, availableStatuses: ANIMAL_STATUS_ENUM[]): Boolean {
25
- return availableStatuses.includes(animal.status)
24
+ function genderFilter<T extends BaseAnimal>(
25
+ animal: T,
26
+ availableGender: ANIMAL_GENDER_ENUM,
27
+ ): boolean {
28
+ return animal.gender === availableGender;
26
29
  }
27
30
 
28
- function abortFilter (animals: IAnimal[]): IAnimal[] {
29
- const result: IAnimal[] = animals.filter(animal => genderFilter(animal, ANIMAL_GENDER_ENUM.cow))
30
- return result
31
+ function abortFilter<T extends BaseAnimal>(animals: T[]): T[] {
32
+ const result: T[] = animals.filter((animal) => genderFilter<T>(animal, ANIMAL_GENDER_ENUM.cow));
33
+ return result;
31
34
  }
32
35
 
33
- function neosemFilter (animals: IAnimal[]): IAnimal[] {
34
- return abortFilter(animals)
36
+ function neosemFilter<T extends BaseAnimal>(animals: T[]): T[] {
37
+ return abortFilter(animals);
35
38
  }
36
39
 
37
- function osemenenieFilter(animals: IAnimal[]): IAnimal[] {
38
- const result: IAnimal[] = 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)
40
+ function osemenenieFilter<T extends BaseAnimal>(animals: T[]): T[] {
41
+ const result = animals.filter((animal) => {
42
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
43
+ const statusOk = statusFilter(animal, [status.HEIFER, status.BRED, status.OPEN, status.FRESH]);
44
+ const ageOk = ageFilter(animal, defaultCowAge);
42
45
 
43
- return genderOk && statusOk && ageOk && animal
44
- })
46
+ return genderOk && statusOk && ageOk && animal;
47
+ });
45
48
 
46
- return result
49
+ return result;
47
50
  }
48
51
 
49
- function otelFilter (animals: IAnimal[]): IAnimal[] {
50
- const result: IAnimal[] = 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)
52
+ function otelFilter<T extends BaseAnimal>(animals: T[]): T[] {
53
+ const result = animals.filter((animal) => {
54
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
55
+ const statusOk = statusFilter(animal, [status.DRY, status.PREGNANT]);
56
+ const ageOk = ageFilter(animal, defaultCowAge);
54
57
 
55
- return genderOk && statusOk && ageOk && animal
56
- })
57
- return result
58
+ return genderOk && statusOk && ageOk && animal;
59
+ });
60
+ return result;
58
61
  }
59
62
 
60
- function recheckFilter (animals: IAnimal[]): IAnimal[] {
61
- const result: IAnimal[] = 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
- console.info('result', result)
79
- return result
63
+ function recheckFilter<T extends BaseAnimal>(animals: T[]): T[] {
64
+ const result = animals.filter((animal) => {
65
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
66
+ const ageOk = ageFilter(animal, defaultCowAge);
67
+
68
+ let availableStatus = [status.BRED, status.PREGNANT, status.DRY];
69
+ if (animal.animalEventRelation) {
70
+ const previousRechecks = animal.animalEventRelation.filter((row) => {
71
+ return row.eventDetail.type === EVENT_TYPES_ENUM.recheck;
72
+ });
73
+ if (previousRechecks.length == 0) {
74
+ availableStatus = [status.BRED];
75
+ }
76
+ }
77
+ const statusOk = statusFilter(animal, availableStatus);
78
+
79
+ return genderOk && statusOk && ageOk && animal;
80
+ });
81
+ return result;
80
82
  }
81
83
 
82
- function suhostoiFilter (animals: IAnimal[]): IAnimal[] {
83
- return abortFilter(animals)
84
+ function suhostoiFilter<T extends BaseAnimal>(animals: T[]): T[] {
85
+ return abortFilter(animals);
84
86
  }
85
87
 
86
- function pozSuhostoiFilter (animals: IAnimal[]): IAnimal[] {
87
- const result: IAnimal[] = animals.filter(animal => {
88
- const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow)
89
- const statusOk = statusFilter(animal, [status.dry])
90
- const ageOk = ageFilter(animal, defaultCowAge)
88
+ function pozSuhostoiFilter<T extends BaseAnimal>(animals: T[]): T[] {
89
+ const result = animals.filter((animal) => {
90
+ const genderOk = genderFilter(animal, ANIMAL_GENDER_ENUM.cow);
91
+ const statusOk = statusFilter(animal, [status.DRY]);
92
+ const ageOk = ageFilter(animal, defaultCowAge);
91
93
 
92
- return genderOk && statusOk && ageOk && animal
93
- })
94
- return result
94
+ return genderOk && statusOk && ageOk && animal;
95
+ });
96
+ return result;
95
97
  }
96
98
 
97
- function transferOutFilter (animals: IAnimal[]): IAnimal[] {
98
- return animals
99
+ function transferOutFilter<T extends BaseAnimal>(animals: T[]): T[] {
100
+ return animals;
99
101
  }
100
102
 
101
- function perevodFilter (animals: IAnimal[]) {
102
- return animals
103
+ function perevodFilter<T extends BaseAnimal>(animals: T[]) {
104
+ return animals;
103
105
  }
104
106
 
105
- interface IFilters {
106
- [key: string]: (animals: IAnimal[]) => IAnimal[]
107
+ interface IFilters<T extends BaseAnimal> {
108
+ [key: string]: (animals: T[]) => T[];
107
109
  }
108
110
 
109
- export function filter (animals: IAnimal[], eventType: EVENT_TYPES_ENUM) {
110
- const filters: IFilters = {
111
- [EVENT_TYPES_ENUM.abort]: abortFilter,
112
- [EVENT_TYPES_ENUM.neosem]: neosemFilter,
113
- [EVENT_TYPES_ENUM.osemenenie]: osemenenieFilter,
114
- [EVENT_TYPES_ENUM.otel]: otelFilter,
115
- [EVENT_TYPES_ENUM.recheck]: recheckFilter,
116
- [EVENT_TYPES_ENUM.suhostoi]: suhostoiFilter,
117
- [EVENT_TYPES_ENUM.pozSuhostoi]: pozSuhostoiFilter,
118
- [EVENT_TYPES_ENUM.perevod]: perevodFilter,
119
- [EVENT_TYPES_ENUM.transferOut]: transferOutFilter
120
- }
121
- try {
122
- const result = filters[eventType](animals)
123
- return result
124
- } catch (err) {
125
- throw new Error(`AnimalForEventFilter.filter.${eventType} not implemented`)
126
- }
111
+ export function filter<T extends BaseAnimal>(animals: T[], eventType: EVENT_TYPES_ENUM) {
112
+ const filters: IFilters<T> = {
113
+ [EVENT_TYPES_ENUM.abort]: abortFilter,
114
+ [EVENT_TYPES_ENUM.neosem]: neosemFilter,
115
+ [EVENT_TYPES_ENUM.osemenenie]: osemenenieFilter,
116
+ [EVENT_TYPES_ENUM.otel]: otelFilter,
117
+ [EVENT_TYPES_ENUM.recheck]: recheckFilter,
118
+ [EVENT_TYPES_ENUM.suhostoi]: suhostoiFilter,
119
+ [EVENT_TYPES_ENUM.pozSuhostoi]: pozSuhostoiFilter,
120
+ [EVENT_TYPES_ENUM.perevod]: perevodFilter,
121
+ [EVENT_TYPES_ENUM.transferOut]: transferOutFilter,
122
+ };
123
+ try {
124
+ const result = filters[eventType](animals);
125
+ return result;
126
+ } catch (err) {
127
+ throw new Error(`AnimalForEventFilter.filter.${eventType} not implemented`);
128
+ }
127
129
  }
@@ -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
@@ -1,4 +1,4 @@
1
- import { EnumItem, EnumArrayAsObject } from "./types";
1
+ import { EnumItem, EnumArrayAsObject } from './types';
2
2
 
3
3
  export function asObject(arrayOfObjects: EnumItem[]): EnumArrayAsObject {
4
4
  const result: EnumArrayAsObject = {};
@@ -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-expect-error: skip
23
+ obj[key] = e[key];
24
+ return obj;
25
+ }, {});
27
26
 
28
- return result
29
- }
27
+ return result;
28
+ }
package/src/index.ts CHANGED
@@ -1,11 +1,11 @@
1
- import * as dataEnums from "./enums";
2
- import { BREED, BREED_AS_OBJECT } from "./breed";
3
- import * as typeDefinitions from "./types";
4
- import * as _rolePermissions from './role-permissions'
5
- import * as _animalForEventFilters from './event'
1
+ import * as dataEnums from './enums';
2
+ import { BREED, BREED_AS_OBJECT } from './breed';
3
+ import * as typeDefinitions from './types';
4
+ import * as _rolePermissions from './role-permissions';
5
+ import * as _animalForEventFilters from './event';
6
6
 
7
7
  export const enums = { ...dataEnums, BREED, BREED_AS_OBJECT };
8
- export const rolePermissions = _rolePermissions
8
+ export const rolePermissions = _rolePermissions;
9
9
  export const types = typeDefinitions;
10
10
 
11
- export const animalForEventFilters = _animalForEventFilters
11
+ export const animalForEventFilters = _animalForEventFilters;