dl-commons 0.0.2-testing.1 → 0.0.2-testing.3
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 +5 -2
- package/dist/index.js +7 -2
- package/dist/index.js.map +1 -1
- package/dist/models/interfaces/group-session.interface.d.ts +6 -2
- package/dist/models/interfaces/smtp-api-config.interface.d.ts +5 -0
- package/dist/models/interfaces/smtp-api-config.interface.js +3 -0
- package/dist/models/interfaces/smtp-api-config.interface.js.map +1 -0
- package/dist/models/interfaces/smtp.interface.d.ts +5 -0
- package/dist/models/interfaces/smtp.interface.js +3 -0
- package/dist/models/interfaces/smtp.interface.js.map +1 -0
- package/dist/models/interfaces/user.interface.d.ts +1 -0
- package/dist/models/schemas/base.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/contact.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/dictionary-embedded.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/group-session.schema.d.ts +4 -5
- package/dist/models/schemas/embedded/group-session.schema.js +3 -6
- package/dist/models/schemas/embedded/group-session.schema.js.map +1 -1
- package/dist/models/schemas/embedded/i18n.embedded.d.ts +2 -2
- package/dist/models/schemas/embedded/person.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/record.embedded.d.ts +2 -2
- package/dist/models/schemas/embedded/residence.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/session-user.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/student-embedded.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/teacher.schema.d.ts +2 -2
- package/dist/models/schemas/embedded/time.schema.d.ts +17 -0
- package/dist/models/schemas/embedded/time.schema.js +33 -0
- package/dist/models/schemas/embedded/time.schema.js.map +1 -0
- package/dist/models/schemas/identifable.schema.d.ts +2 -2
- package/dist/models/schemas/parent.schema.d.ts +2 -2
- package/dist/models/schemas/session.schema.d.ts +2 -2
- package/dist/services/sessions.service.d.ts +2 -1
- package/dist/services/sessions.service.js.map +1 -1
- package/dist/services/smtp.service.d.ts +11 -0
- package/dist/services/smtp.service.js +71 -0
- package/dist/services/smtp.service.js.map +1 -0
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +1 -1
- package/src/index.ts +20 -2
- package/src/models/interfaces/group-session.interface.ts +7 -2
- package/src/models/interfaces/smtp-api-config.interface.ts +5 -0
- package/src/models/interfaces/smtp.interface.ts +5 -0
- package/src/models/interfaces/user.interface.ts +1 -0
- package/src/models/schemas/embedded/group-session.schema.ts +4 -6
- package/src/models/schemas/embedded/time.schema.ts +18 -0
- package/src/services/sessions.service.ts +2 -1
- package/src/services/smtp.service.ts +71 -0
package/package.json
CHANGED
package/src/index.ts
CHANGED
|
@@ -5,7 +5,16 @@ import { validationExceptionFactory } from './factories/exception.factory';
|
|
|
5
5
|
import { BaseExceptionsFilter } from './filters/base-exception.filter';
|
|
6
6
|
import { AccessTokenGuard } from './guards/access-token.guard';
|
|
7
7
|
import { AllowPermissions, PermissionGuard } from './guards/permission.guard';
|
|
8
|
-
import {
|
|
8
|
+
import {
|
|
9
|
+
APP__PORT,
|
|
10
|
+
APP__DEBUG,
|
|
11
|
+
APP__ACCESS_TOKEN,
|
|
12
|
+
MONGO__CS,
|
|
13
|
+
REDIS__CS,
|
|
14
|
+
KAFKA__BROKERS,
|
|
15
|
+
APP__MONGO__CS,
|
|
16
|
+
DL_SESSIONS__MONGO__CS,
|
|
17
|
+
} from './models/consts/env-vars.const';
|
|
9
18
|
import { I18nDTO } from './models/dtos/commons/i18n.dto';
|
|
10
19
|
import {
|
|
11
20
|
IMongoPage,
|
|
@@ -56,10 +65,13 @@ import { IStudentEmbedded } from './models/interfaces/student-embedded.interface
|
|
|
56
65
|
import { StudentEmbedded, StudentEmbeddedDocument, StudentEmbeddedSchema } from './models/schemas/embedded/student-embedded.schema';
|
|
57
66
|
import { ITeacher } from './models/interfaces/teacher.interface';
|
|
58
67
|
import { WeekDay } from './models/enums/week-day.enum';
|
|
59
|
-
import { IGroupSession } from './models/interfaces/group-session.interface';
|
|
68
|
+
import { IGroupSession, ITime } from './models/interfaces/group-session.interface';
|
|
60
69
|
import { GroupState } from './models/enums/group-state.enum';
|
|
61
70
|
import { GroupSessionSchema, GroupSessionDocument, GroupSession } from './models/schemas/embedded/group-session.schema';
|
|
62
71
|
import { TeacherSchema, TeacherDocument, Teacher } from './models/schemas/embedded/teacher.schema';
|
|
72
|
+
import { ISMTPAPIConfig } from './models/interfaces/smtp-api-config.interface';
|
|
73
|
+
import { SMTPService } from './services/smtp.service';
|
|
74
|
+
import { Time, TimeDocument, TimeSchema } from './models/schemas/embedded/time.schema';
|
|
63
75
|
|
|
64
76
|
export {
|
|
65
77
|
/**
|
|
@@ -67,6 +79,7 @@ export {
|
|
|
67
79
|
*/
|
|
68
80
|
SessionsService,
|
|
69
81
|
DictionariesService,
|
|
82
|
+
SMTPService,
|
|
70
83
|
|
|
71
84
|
/**
|
|
72
85
|
* Rest Wrapper
|
|
@@ -136,6 +149,8 @@ export {
|
|
|
136
149
|
IStudentEmbedded,
|
|
137
150
|
ITeacher,
|
|
138
151
|
IGroupSession,
|
|
152
|
+
ITime,
|
|
153
|
+
ISMTPAPIConfig,
|
|
139
154
|
|
|
140
155
|
/**
|
|
141
156
|
* Schemas & Documents
|
|
@@ -179,6 +194,9 @@ export {
|
|
|
179
194
|
StudentEmbeddedSchema,
|
|
180
195
|
StudentEmbeddedDocument,
|
|
181
196
|
StudentEmbedded,
|
|
197
|
+
TimeSchema,
|
|
198
|
+
TimeDocument,
|
|
199
|
+
Time,
|
|
182
200
|
|
|
183
201
|
/**
|
|
184
202
|
* Filters
|
|
@@ -2,9 +2,14 @@ import { WeekDay } from '../enums/week-day.enum';
|
|
|
2
2
|
import { II18n } from './i18n.interface';
|
|
3
3
|
import { IIdentifable } from './identifable.interface';
|
|
4
4
|
|
|
5
|
+
export interface ITime {
|
|
6
|
+
inString: string;
|
|
7
|
+
inNumber: number;
|
|
8
|
+
zone: string;
|
|
9
|
+
}
|
|
10
|
+
|
|
5
11
|
export interface IGroupSession extends IIdentifable {
|
|
6
12
|
description: II18n;
|
|
7
13
|
day: WeekDay;
|
|
8
|
-
time:
|
|
9
|
-
timeZone: string;
|
|
14
|
+
time: ITime;
|
|
10
15
|
}
|
|
@@ -1,10 +1,11 @@
|
|
|
1
1
|
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
2
|
import { HydratedDocument } from 'mongoose';
|
|
3
3
|
import { Identifable } from '../identifable.schema';
|
|
4
|
-
import { IGroupSession } from '../../interfaces/group-session.interface';
|
|
4
|
+
import { IGroupSession, ITime } from '../../interfaces/group-session.interface';
|
|
5
5
|
import { WeekDay } from '../../enums/week-day.enum';
|
|
6
6
|
import { I18nSchema } from './i18n.embedded';
|
|
7
7
|
import { II18n } from '../../interfaces/i18n.interface';
|
|
8
|
+
import { Time } from './time.schema';
|
|
8
9
|
|
|
9
10
|
@Schema()
|
|
10
11
|
export class GroupSession extends Identifable implements IGroupSession {
|
|
@@ -14,11 +15,8 @@ export class GroupSession extends Identifable implements IGroupSession {
|
|
|
14
15
|
@Prop({ type: String, enum: WeekDay, required: true })
|
|
15
16
|
day: WeekDay;
|
|
16
17
|
|
|
17
|
-
@Prop({ type:
|
|
18
|
-
time:
|
|
19
|
-
|
|
20
|
-
@Prop({ type: String, required: true })
|
|
21
|
-
timeZone: string;
|
|
18
|
+
@Prop({ type: Time, required: true })
|
|
19
|
+
time: ITime;
|
|
22
20
|
}
|
|
23
21
|
|
|
24
22
|
export const GroupSessionSchema = SchemaFactory.createForClass(GroupSession);
|
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Prop, Schema, SchemaFactory } from '@nestjs/mongoose';
|
|
2
|
+
import { HydratedDocument } from 'mongoose';
|
|
3
|
+
import { ITime } from '../../interfaces/group-session.interface';
|
|
4
|
+
|
|
5
|
+
@Schema({ _id: false })
|
|
6
|
+
export class Time implements ITime {
|
|
7
|
+
@Prop({ type: String, required: true })
|
|
8
|
+
inString: string;
|
|
9
|
+
|
|
10
|
+
@Prop({ type: Number, required: true })
|
|
11
|
+
inNumber: number;
|
|
12
|
+
|
|
13
|
+
@Prop({ type: String, required: true })
|
|
14
|
+
zone: string;
|
|
15
|
+
}
|
|
16
|
+
|
|
17
|
+
export const TimeSchema = SchemaFactory.createForClass(Time);
|
|
18
|
+
export type TimeDocument = HydratedDocument<Time>;
|
|
@@ -7,6 +7,7 @@ import { firstValueFrom } from 'rxjs';
|
|
|
7
7
|
import { Model } from 'mongoose';
|
|
8
8
|
import { Session, SessionDocument } from '../models/schemas/session.schema';
|
|
9
9
|
import { InjectModel } from '@nestjs/mongoose';
|
|
10
|
+
import { Types } from 'mongoose';
|
|
10
11
|
|
|
11
12
|
@Injectable()
|
|
12
13
|
export class SessionsService {
|
|
@@ -26,7 +27,7 @@ export class SessionsService {
|
|
|
26
27
|
//#endregion
|
|
27
28
|
|
|
28
29
|
//#region Public API
|
|
29
|
-
public async create(userId: string, userAgent: string, ip: string) {
|
|
30
|
+
public async create(userId: string | Types.ObjectId, userAgent: string, ip: string) {
|
|
30
31
|
try {
|
|
31
32
|
const endpoint = `${this._baseUrl}/v1/sessions/${userId}`;
|
|
32
33
|
const headers = { 'user-agent': userAgent, 'x-ip': ip };
|
|
@@ -0,0 +1,71 @@
|
|
|
1
|
+
import { HttpService } from '@nestjs/axios';
|
|
2
|
+
import { ConfigService } from '@nestjs/config';
|
|
3
|
+
import { catchError, firstValueFrom, map } from 'rxjs';
|
|
4
|
+
import { Injectable } from '@nestjs/common';
|
|
5
|
+
import { RESTResponseBody, RESTError } from '../models/dtos/wrappers/rest-wrapper.class';
|
|
6
|
+
import { ISMTP } from '../models/interfaces/smtp.interface';
|
|
7
|
+
|
|
8
|
+
@Injectable()
|
|
9
|
+
export class SMTPService {
|
|
10
|
+
//#region Private Members
|
|
11
|
+
private _baseUrl: string;
|
|
12
|
+
//#endregion
|
|
13
|
+
|
|
14
|
+
//#region Constructor
|
|
15
|
+
constructor(private readonly _httpService: HttpService, private readonly _configService: ConfigService) {
|
|
16
|
+
this._baseUrl = this._configService.getOrThrow('DL_SMTP__REST__BASE_URL');
|
|
17
|
+
}
|
|
18
|
+
//#endregion
|
|
19
|
+
|
|
20
|
+
//#region Public API
|
|
21
|
+
public async send(subject: string, from: string, to: string, html: string, profileId: string) {
|
|
22
|
+
const requestBody = {
|
|
23
|
+
data: {
|
|
24
|
+
from,
|
|
25
|
+
to: [to],
|
|
26
|
+
subject,
|
|
27
|
+
html,
|
|
28
|
+
},
|
|
29
|
+
};
|
|
30
|
+
|
|
31
|
+
const response$ = this._httpService.post<RESTResponseBody<ISMTP>>(`${this._baseUrl}/v1/emails/send`, requestBody, { params: { profileId } });
|
|
32
|
+
const response = await firstValueFrom(response$);
|
|
33
|
+
|
|
34
|
+
if (response.data.errors) {
|
|
35
|
+
throw new RESTError('smtp_api_error', response.data.errors);
|
|
36
|
+
}
|
|
37
|
+
if (!response.data || !response.data.result) {
|
|
38
|
+
throw new RESTError('smtp_api_error', 'empty response');
|
|
39
|
+
}
|
|
40
|
+
|
|
41
|
+
return response.data.result.data;
|
|
42
|
+
}
|
|
43
|
+
|
|
44
|
+
public send$(subject: string, from: string, to: string, html: string, profileId: string) {
|
|
45
|
+
const requestBody = {
|
|
46
|
+
data: {
|
|
47
|
+
from,
|
|
48
|
+
to: [to],
|
|
49
|
+
subject,
|
|
50
|
+
html,
|
|
51
|
+
},
|
|
52
|
+
};
|
|
53
|
+
|
|
54
|
+
const response$ = this._httpService.post<RESTResponseBody<ISMTP>>(`${this._baseUrl}/v1/emails/send`, requestBody, { params: { profileId } });
|
|
55
|
+
return response$.pipe(
|
|
56
|
+
map((response) => {
|
|
57
|
+
if (response.data.errors) {
|
|
58
|
+
throw new RESTError('smtp_api_error', response.data.errors);
|
|
59
|
+
}
|
|
60
|
+
if (!response.data || !response.data.result) {
|
|
61
|
+
throw new RESTError('smtp_api_error', 'empty response');
|
|
62
|
+
}
|
|
63
|
+
return response.data.result.data;
|
|
64
|
+
}),
|
|
65
|
+
catchError((e) => {
|
|
66
|
+
throw new RESTError('smtp_api_error', e);
|
|
67
|
+
}),
|
|
68
|
+
);
|
|
69
|
+
}
|
|
70
|
+
//#endregion
|
|
71
|
+
}
|