dl-commons 0.0.1-testing.3 → 0.0.1-testing.57
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/dist/index.d.ts +12 -1
- package/dist/index.js +17 -2
- package/dist/index.js.map +1 -1
- package/dist/models/enums/group-state.enum.d.ts +5 -0
- package/dist/models/enums/group-state.enum.js +10 -0
- package/dist/models/enums/group-state.enum.js.map +1 -0
- package/dist/models/enums/week-day.enum.d.ts +9 -0
- package/dist/models/enums/week-day.enum.js +14 -0
- package/dist/models/enums/week-day.enum.js.map +1 -0
- package/dist/models/interfaces/group-embedded.interface.d.ts +17 -0
- package/dist/models/interfaces/group-embedded.interface.js +3 -0
- package/dist/models/interfaces/group-embedded.interface.js.map +1 -0
- package/dist/models/interfaces/group-session.interface.d.ts +9 -0
- package/dist/models/interfaces/group-session.interface.js +3 -0
- package/dist/models/interfaces/group-session.interface.js.map +1 -0
- package/dist/models/interfaces/identifable.interface.d.ts +1 -1
- package/dist/models/interfaces/parent.interface.d.ts +7 -0
- package/dist/models/interfaces/parent.interface.js +3 -0
- package/dist/models/interfaces/parent.interface.js.map +1 -0
- package/dist/models/interfaces/person.interface.d.ts +2 -0
- package/dist/models/interfaces/student-embedded.interface.d.ts +10 -0
- package/dist/models/interfaces/student-embedded.interface.js +3 -0
- package/dist/models/interfaces/student-embedded.interface.js.map +1 -0
- package/dist/models/interfaces/teacher.interface.d.ts +6 -0
- package/dist/models/interfaces/teacher.interface.js +3 -0
- package/dist/models/interfaces/teacher.interface.js.map +1 -0
- package/dist/models/schemas/embedded/group-session.schema.d.ts +21 -0
- package/dist/models/schemas/embedded/group-session.schema.js +40 -0
- package/dist/models/schemas/embedded/group-session.schema.js.map +1 -0
- package/dist/models/schemas/embedded/person.schema.d.ts +2 -0
- package/dist/models/schemas/embedded/person.schema.js +5 -0
- package/dist/models/schemas/embedded/person.schema.js.map +1 -1
- package/dist/models/schemas/embedded/student-embedded.schema.d.ts +22 -0
- package/dist/models/schemas/embedded/student-embedded.schema.js +41 -0
- package/dist/models/schemas/embedded/student-embedded.schema.js.map +1 -0
- package/dist/models/schemas/embedded/teacher.schema.d.ts +17 -0
- package/dist/models/schemas/embedded/teacher.schema.js +31 -0
- package/dist/models/schemas/embedded/teacher.schema.js.map +1 -0
- package/dist/models/schemas/parent.schema.d.ts +19 -0
- package/dist/models/schemas/parent.schema.js +36 -0
- package/dist/models/schemas/parent.schema.js.map +1 -0
- package/dist/services/dictionaries.service.d.ts +1 -0
- package/dist/services/dictionaries.service.js +27 -2
- package/dist/services/dictionaries.service.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +2 -2
- package/src/index.ts +28 -0
- package/src/models/enums/group-state.enum.ts +5 -0
- package/src/models/enums/week-day.enum.ts +9 -0
- package/src/models/interfaces/group-embedded.interface.ts +18 -0
- package/src/models/interfaces/group-session.interface.ts +10 -0
- package/src/models/interfaces/identifable.interface.ts +1 -1
- package/src/models/interfaces/parent.interface.ts +8 -0
- package/src/models/interfaces/person.interface.ts +2 -0
- package/src/models/interfaces/student-embedded.interface.ts +12 -0
- package/src/models/interfaces/teacher.interface.ts +7 -0
- package/src/models/schemas/embedded/group-session.schema.ts +25 -0
- package/src/models/schemas/embedded/person.schema.ts +5 -0
- package/src/models/schemas/embedded/student-embedded.schema.ts +28 -0
- package/src/models/schemas/embedded/teacher.schema.ts +17 -0
- package/src/models/schemas/parent.schema.ts +22 -0
- package/src/services/dictionaries.service.ts +44 -2
package/package.json
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "dl-commons",
|
|
3
3
|
"type": "commonjs",
|
|
4
|
-
"version": "0.0.1-testing.
|
|
4
|
+
"version": "0.0.1-testing.57",
|
|
5
5
|
"description": "distance learning commons",
|
|
6
6
|
"main": "dist/index.js",
|
|
7
7
|
"types": "dist/index.d.ts",
|
|
@@ -10,7 +10,7 @@
|
|
|
10
10
|
"build": "tsc",
|
|
11
11
|
"pack": "npm run build && npm pack --pack-destination ./packs"
|
|
12
12
|
},
|
|
13
|
-
"author": "",
|
|
13
|
+
"author": "Giorgi Maisuradze",
|
|
14
14
|
"license": "ISC",
|
|
15
15
|
"dependencies": {
|
|
16
16
|
"@nestjs/axios": "^3.1.0",
|
package/src/index.ts
CHANGED
|
@@ -49,12 +49,24 @@ import { transformers } from './transformers/common.transformer';
|
|
|
49
49
|
import { IUser } from './models/interfaces/user.interface';
|
|
50
50
|
import { SessionUser, SessionUserDocument, SessionUserSchema } from './models/schemas/embedded/session-user.schema';
|
|
51
51
|
import { Session, SessionDocument, SessionSchema } from './models/schemas/session.schema';
|
|
52
|
+
import { DictionariesService } from './services/dictionaries.service';
|
|
53
|
+
import { IParent } from './models/interfaces/parent.interface';
|
|
54
|
+
import { IGroupEmbedded } from './models/interfaces/group-embedded.interface';
|
|
55
|
+
import { IStudentEmbedded } from './models/interfaces/student-embedded.interface';
|
|
56
|
+
import { StudentEmbedded, StudentEmbeddedDocument, StudentEmbeddedSchema } from './models/schemas/embedded/student-embedded.schema';
|
|
57
|
+
import { ITeacher } from './models/interfaces/teacher.interface';
|
|
58
|
+
import { WeekDay } from './models/enums/week-day.enum';
|
|
59
|
+
import { IGroupSession } from './models/interfaces/group-session.interface';
|
|
60
|
+
import { GroupState } from './models/enums/group-state.enum';
|
|
61
|
+
import { GroupSessionSchema, GroupSessionDocument, GroupSession } from './models/schemas/embedded/group-session.schema';
|
|
62
|
+
import { TeacherSchema, TeacherDocument, Teacher } from './models/schemas/embedded/teacher.schema';
|
|
52
63
|
|
|
53
64
|
export {
|
|
54
65
|
/**
|
|
55
66
|
* Services
|
|
56
67
|
*/
|
|
57
68
|
SessionsService,
|
|
69
|
+
DictionariesService,
|
|
58
70
|
|
|
59
71
|
/**
|
|
60
72
|
* Rest Wrapper
|
|
@@ -93,6 +105,8 @@ export {
|
|
|
93
105
|
RecordState,
|
|
94
106
|
ContactType,
|
|
95
107
|
UserVerificationLevel,
|
|
108
|
+
WeekDay,
|
|
109
|
+
GroupState,
|
|
96
110
|
|
|
97
111
|
/**
|
|
98
112
|
* DTOs
|
|
@@ -115,6 +129,11 @@ export {
|
|
|
115
129
|
ISessionUser,
|
|
116
130
|
ISession,
|
|
117
131
|
IUser,
|
|
132
|
+
IParent,
|
|
133
|
+
IGroupEmbedded,
|
|
134
|
+
IStudentEmbedded,
|
|
135
|
+
ITeacher,
|
|
136
|
+
IGroupSession,
|
|
118
137
|
|
|
119
138
|
/**
|
|
120
139
|
* Schemas & Documents
|
|
@@ -149,6 +168,15 @@ export {
|
|
|
149
168
|
Session,
|
|
150
169
|
SessionSchema,
|
|
151
170
|
SessionDocument,
|
|
171
|
+
GroupSessionSchema,
|
|
172
|
+
GroupSessionDocument,
|
|
173
|
+
GroupSession,
|
|
174
|
+
TeacherSchema,
|
|
175
|
+
TeacherDocument,
|
|
176
|
+
Teacher,
|
|
177
|
+
StudentEmbeddedSchema,
|
|
178
|
+
StudentEmbeddedDocument,
|
|
179
|
+
StudentEmbedded,
|
|
152
180
|
|
|
153
181
|
/**
|
|
154
182
|
* Filters
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { GroupState } from '../enums/group-state.enum';
|
|
2
|
+
import { IBase } from './base.interface';
|
|
3
|
+
import { IDictionary } from './dictionary.interface';
|
|
4
|
+
import { IGroupSession } from './group-session.interface';
|
|
5
|
+
import { II18n } from './i18n.interface';
|
|
6
|
+
import { IStudentEmbedded } from './student-embedded.interface';
|
|
7
|
+
import { ITeacher } from './teacher.interface';
|
|
8
|
+
|
|
9
|
+
export interface IGroupEmbedded extends IBase {
|
|
10
|
+
teacher: ITeacher;
|
|
11
|
+
students: IStudentEmbedded[];
|
|
12
|
+
sessions: IGroupSession[];
|
|
13
|
+
knowladgeLevels: IDictionary[];
|
|
14
|
+
description: II18n;
|
|
15
|
+
state: GroupState;
|
|
16
|
+
startDate: Date;
|
|
17
|
+
endDate: Date;
|
|
18
|
+
}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { WeekDay } from '../enums/week-day.enum';
|
|
2
|
+
import { II18n } from './i18n.interface';
|
|
3
|
+
import { IIdentifable } from './identifable.interface';
|
|
4
|
+
|
|
5
|
+
export interface IGroupSession extends IIdentifable {
|
|
6
|
+
description: II18n;
|
|
7
|
+
day: WeekDay;
|
|
8
|
+
time: string;
|
|
9
|
+
timeZone: string;
|
|
10
|
+
}
|
|
@@ -1,9 +1,11 @@
|
|
|
1
|
+
import { IDictionary } from './dictionary.interface';
|
|
1
2
|
import { IResidence } from './residence.interface';
|
|
2
3
|
|
|
3
4
|
export interface IPerson {
|
|
4
5
|
pid?: string | null | undefined;
|
|
5
6
|
firstName: string;
|
|
6
7
|
lastName: string;
|
|
8
|
+
gender?: IDictionary | null | undefined;
|
|
7
9
|
birthDate?: Date | null | undefined;
|
|
8
10
|
residence?: IResidence | null | undefined;
|
|
9
11
|
}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { IDictionary } from "./dictionary.interface";
|
|
2
|
+
import { IIdentifable } from "./identifable.interface";
|
|
3
|
+
import { IParent } from "./parent.interface";
|
|
4
|
+
import { IPerson } from "./person.interface";
|
|
5
|
+
|
|
6
|
+
export interface IStudentEmbedded extends IIdentifable {
|
|
7
|
+
parent: IParent;
|
|
8
|
+
person: IPerson;
|
|
9
|
+
knowladgeLevel: IDictionary;
|
|
10
|
+
description?: string;
|
|
11
|
+
//group?: IGroup;
|
|
12
|
+
}
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument } from 'mongoose';
|
|
3
|
+
import { Identifable } from '../identifable.schema';
|
|
4
|
+
import { IGroupSession } from '../../interfaces/group-session.interface';
|
|
5
|
+
import { WeekDay } from '../../enums/week-day.enum';
|
|
6
|
+
import { I18nSchema } from './i18n.embedded';
|
|
7
|
+
import { II18n } from '../../interfaces/i18n.interface';
|
|
8
|
+
|
|
9
|
+
@Schema()
|
|
10
|
+
export class GroupSession extends Identifable implements IGroupSession {
|
|
11
|
+
@Prop({ type: I18nSchema, required: false })
|
|
12
|
+
description: II18n;
|
|
13
|
+
|
|
14
|
+
@Prop({ type: String, enum: WeekDay, required: true })
|
|
15
|
+
day: WeekDay;
|
|
16
|
+
|
|
17
|
+
@Prop({ type: String, required: true })
|
|
18
|
+
time: string;
|
|
19
|
+
|
|
20
|
+
@Prop({ type: String, required: true })
|
|
21
|
+
timeZone: string;
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export const GroupSessionSchema = SchemaFactory.createForClass(GroupSession);
|
|
25
|
+
export type GroupSessionDocument = HydratedDocument<GroupSession>;
|
|
@@ -3,6 +3,8 @@ import { IPerson } from '../../interfaces/person.interface';
|
|
|
3
3
|
import { HydratedDocument } from 'mongoose';
|
|
4
4
|
import { IResidence } from '../../interfaces/residence.interface';
|
|
5
5
|
import { Residence, ResidenceSchema } from './residence.schema';
|
|
6
|
+
import { DictionaryEmbeddedSchema } from './dictionary-embedded.schema';
|
|
7
|
+
import { IDictionary } from '../../interfaces/dictionary.interface';
|
|
6
8
|
|
|
7
9
|
@Schema({ _id: false })
|
|
8
10
|
export class Person implements IPerson {
|
|
@@ -18,6 +20,9 @@ export class Person implements IPerson {
|
|
|
18
20
|
@Prop({ type: Date, required: false, default: null })
|
|
19
21
|
birthDate: Date;
|
|
20
22
|
|
|
23
|
+
@Prop({ type: DictionaryEmbeddedSchema, required: false })
|
|
24
|
+
gender: IDictionary;
|
|
25
|
+
|
|
21
26
|
@Prop({ type: ResidenceSchema, required: true, default: () => new Residence() })
|
|
22
27
|
residence: IResidence;
|
|
23
28
|
}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument } from 'mongoose';
|
|
3
|
+
import { Identifable } from '../identifable.schema';
|
|
4
|
+
import { IStudentEmbedded } from '../../interfaces/student-embedded.interface';
|
|
5
|
+
import { IParent } from '../../interfaces/parent.interface';
|
|
6
|
+
import { IPerson } from '../../interfaces/person.interface';
|
|
7
|
+
import { IDictionary } from '../../interfaces/dictionary.interface';
|
|
8
|
+
import { DictionaryEmbeddedSchema } from './dictionary-embedded.schema';
|
|
9
|
+
import { PersonSchema } from './person.schema';
|
|
10
|
+
import { ParentSchema } from '../parent.schema';
|
|
11
|
+
|
|
12
|
+
@Schema({ _id: false })
|
|
13
|
+
export class StudentEmbedded extends Identifable implements IStudentEmbedded {
|
|
14
|
+
@Prop({ required: false, type: String })
|
|
15
|
+
description: string;
|
|
16
|
+
|
|
17
|
+
@Prop({ type: ParentSchema, required: true })
|
|
18
|
+
parent: IParent;
|
|
19
|
+
|
|
20
|
+
@Prop({ type: PersonSchema, required: true })
|
|
21
|
+
person: IPerson;
|
|
22
|
+
|
|
23
|
+
@Prop({ type: DictionaryEmbeddedSchema, required: true })
|
|
24
|
+
knowladgeLevel: IDictionary;
|
|
25
|
+
}
|
|
26
|
+
|
|
27
|
+
export const StudentEmbeddedSchema = SchemaFactory.createForClass(StudentEmbedded);
|
|
28
|
+
export type StudentEmbeddedDocument = HydratedDocument<StudentEmbedded>;
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument, Schema as MongooseSchema, Types } from 'mongoose';
|
|
3
|
+
import { ITeacher } from '../../interfaces/teacher.interface';
|
|
4
|
+
import { IPerson } from '../../interfaces/person.interface';
|
|
5
|
+
import { PersonSchema } from './person.schema';
|
|
6
|
+
|
|
7
|
+
@Schema({ _id: false })
|
|
8
|
+
export class Teacher implements ITeacher {
|
|
9
|
+
@Prop({ type: MongooseSchema.Types.ObjectId, required: true })
|
|
10
|
+
userId: Types.ObjectId | string;
|
|
11
|
+
|
|
12
|
+
@Prop({ type: PersonSchema, required: true })
|
|
13
|
+
person: IPerson;
|
|
14
|
+
}
|
|
15
|
+
|
|
16
|
+
export const TeacherSchema = SchemaFactory.createForClass(Teacher);
|
|
17
|
+
export type TeacherDocument = HydratedDocument<Teacher>;
|
|
@@ -0,0 +1,22 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument, Schema as MongooseSchema, Types } from 'mongoose';
|
|
3
|
+
import { IParent } from '../interfaces/parent.interface';
|
|
4
|
+
import { IContact } from '../interfaces/contact.interface';
|
|
5
|
+
import { IPerson } from '../interfaces/person.interface';
|
|
6
|
+
import { ContactSchema } from './embedded/contact.schema';
|
|
7
|
+
import { PersonSchema } from './embedded/person.schema';
|
|
8
|
+
|
|
9
|
+
@Schema({ _id: false })
|
|
10
|
+
export class Parent implements IParent {
|
|
11
|
+
@Prop({ required: true, type: MongooseSchema.Types.ObjectId })
|
|
12
|
+
userId: string;
|
|
13
|
+
|
|
14
|
+
@Prop({ type: PersonSchema, required: true })
|
|
15
|
+
person: IPerson;
|
|
16
|
+
|
|
17
|
+
@Prop({ type: [ContactSchema], required: true, default: [] })
|
|
18
|
+
contacts: IContact[];
|
|
19
|
+
}
|
|
20
|
+
|
|
21
|
+
export const ParentSchema = SchemaFactory.createForClass(Parent);
|
|
22
|
+
export type ParentDocument = HydratedDocument<Parent>;
|
|
@@ -4,6 +4,7 @@ import { ConfigService } from '@nestjs/config';
|
|
|
4
4
|
import { RESTResponseBody, RESTError } from '../models/dtos/wrappers/rest-wrapper.class';
|
|
5
5
|
import { firstValueFrom } from 'rxjs';
|
|
6
6
|
import { IDictionary } from '../models/interfaces/dictionary.interface';
|
|
7
|
+
import { Types } from 'mongoose';
|
|
7
8
|
|
|
8
9
|
@Injectable()
|
|
9
10
|
export class DictionariesService {
|
|
@@ -30,7 +31,13 @@ export class DictionariesService {
|
|
|
30
31
|
if (!response.data || !response.data.result) {
|
|
31
32
|
throw new RESTError('dictionaries_api_error', 'empty response');
|
|
32
33
|
}
|
|
33
|
-
|
|
34
|
+
|
|
35
|
+
const result: IDictionary = {
|
|
36
|
+
...response.data.result.data,
|
|
37
|
+
_id: new Types.ObjectId(response.data.result.data._id),
|
|
38
|
+
};
|
|
39
|
+
|
|
40
|
+
return result;
|
|
34
41
|
} catch (e) {
|
|
35
42
|
throw RESTError.createFromCatch(e, { keyword: 'unknown', debug: e });
|
|
36
43
|
}
|
|
@@ -48,7 +55,42 @@ export class DictionariesService {
|
|
|
48
55
|
if (!response.data || !response.data.result) {
|
|
49
56
|
throw new RESTError('dictionaries_api_error', 'empty response');
|
|
50
57
|
}
|
|
51
|
-
|
|
58
|
+
|
|
59
|
+
const result: IDictionary = {
|
|
60
|
+
...response.data.result.data,
|
|
61
|
+
_id: new Types.ObjectId(response.data.result.data._id),
|
|
62
|
+
};
|
|
63
|
+
|
|
64
|
+
return result;
|
|
65
|
+
} catch (e) {
|
|
66
|
+
throw RESTError.createFromCatch(e, { keyword: 'unknown', debug: e });
|
|
67
|
+
}
|
|
68
|
+
}
|
|
69
|
+
|
|
70
|
+
public async validateIds(ids: string[]) {
|
|
71
|
+
try {
|
|
72
|
+
const endpoint = `${this._baseUrl}/v1/dictionaries/validate/by-ids`;
|
|
73
|
+
const requestBody = { data: { ids } };
|
|
74
|
+
const response$ = this._httpService.post<RESTResponseBody<IDictionary[]>>(endpoint, requestBody);
|
|
75
|
+
const response = await firstValueFrom(response$);
|
|
76
|
+
|
|
77
|
+
if (response.data.errors) {
|
|
78
|
+
throw new RESTError('dictionaries_api_error', response.data.errors);
|
|
79
|
+
}
|
|
80
|
+
|
|
81
|
+
if (!response.data || !response.data.result) {
|
|
82
|
+
throw new RESTError('dictionaries_api_error', 'empty response');
|
|
83
|
+
}
|
|
84
|
+
|
|
85
|
+
const result: IDictionary[] = [];
|
|
86
|
+
for (let item of response.data.result.data) {
|
|
87
|
+
result.push({
|
|
88
|
+
...item,
|
|
89
|
+
_id: new Types.ObjectId(item._id),
|
|
90
|
+
});
|
|
91
|
+
}
|
|
92
|
+
|
|
93
|
+
return result;
|
|
52
94
|
} catch (e) {
|
|
53
95
|
throw RESTError.createFromCatch(e, { keyword: 'unknown', debug: e });
|
|
54
96
|
}
|