fix issues

This commit is contained in:
Peter Maquiran
2024-12-05 19:14:11 +01:00
parent dad392335e
commit 5a1bbe6103
46 changed files with 378 additions and 1748 deletions
@@ -6,10 +6,10 @@ import { SessionStore } from 'src/app/store/session.service';
import { SignalRService } from 'src/app/infra/socket/signalR/signal-r.service';
import { v4 as uuidv4 } from 'uuid'
import { CreateRoomInputDTO, RoomOutPutDTO } from '../../../../../core/chat/usecase/room/room-create-use-case.service';
import { IRoomRemoteRepository } from 'src/app/core/chat/repository/room/room-remote-repository';
import { IRoomRemoteRepository, ISearchRoom } from 'src/app/core/chat/repository/room/room-remote-repository';
import { RoomByIdOutputDTO } from 'src/app/core/chat/usecase/room/room-get-by-id-use-case.service';
import { RoomUpdateInputDTO, RoomUpdateOutputDTO } from 'src/app/core/chat/usecase/room/room-update-by-id-use-case.service';
import { RoomListOutPutDTO } from '../../../../../core/chat/usecase/room/room-get-list-use-case.service';
import { RoomListItemOutPutDTO, RoomListItemSchema, RoomListOutPutDTO } from '../../../../../core/chat/usecase/room/room-get-list-use-case.service';
import { z } from 'zod';
import { HttpAdapter } from 'src/app/infra/http/adapter';
import { AddMemberToRoomInputDTO } from 'src/app/core/chat/usecase/member/member-add-use-case.service';
@@ -54,6 +54,13 @@ export class RoomRemoteDataSourceService implements IRoomRemoteRepository {
return result.map((e)=> e.data)
}
async search(input: string): Promise<Result<RoomListItemOutPutDTO[], any>> {
const result = await this.Http.get<ISearchRoom>(`${this.baseUrl}/search?value=${input}`);
return result.map((e)=> ( e.data.data.rooms.map(j => ({ chatRoom: j, joinAt: ''})) ))
}
//@ValidateSchema(RoomUpdateInputDTOSchema)
//@APIReturn(RoomByIdOutputDTOSchema,'update/Room/${id}')
async updateRoom(data: RoomUpdateInputDTO): Promise<DataSourceReturn<RoomUpdateOutputDTO>> {
@@ -5,7 +5,7 @@ import { IProfilePictureInputDTO } from '../dto/profilePictureInputDTO';
import { HttpHeaders } from '@angular/common/http';
import { TracingType } from 'src/app/services/monitoring/opentelemetry/tracer';
import { HttpAdapter } from 'src/app/infra/http/adapter';
import { IUserRepositoryLoginParams } from 'src/app/core/user/repository/user-remote-repository';
import { IUserRepositoryLoginParams, UserRefreshTokenInputDTO } from 'src/app/core/user/repository/user-remote-repository';
import { UserLoginOutput } from 'src/app/core/user/use-case/user-login-use-case.service';
import { SessionStore } from 'src/app/store/session.service';
@Injectable({
@@ -33,6 +33,11 @@ export class UserRemoteRepositoryService {
return await this.http.post<UserLoginOutput>(`${this.baseUrl}/Users/${SessionStore.user.UserId}/logout`, {})
}
async refreshToken(input: UserRefreshTokenInputDTO) {
return await this.http.post<UserLoginOutput>(`${this.baseUrl}/Users/RefreshToken`, input)
}
getUserProfilePhoto(guid: string, tracing?: TracingType) {
const geturl = environment.apiURL + 'UserAuthentication/GetPhoto';
+8 -2
View File
@@ -4,6 +4,7 @@ import { UserLoginInput, UserLoginUseCaseService } from 'src/app/core/user/use-c
import { UserLogOutUseCaseService } from 'src/app/core/user/use-case/user-log-out-use-case.service';
import { SessionStore } from './service/session.service'
import { UserEntity } from 'src/app/core/user/entity/userEntity';
import { UserRefreshTokenService } from 'src/app/core/user/use-case/user-refresh-token.service';
@Injectable({
providedIn: 'root'
})
@@ -11,7 +12,8 @@ export class UserService {
constructor(
private userLoginUseCaseService: UserLoginUseCaseService,
private userLogOutUseCaseService: UserLogOutUseCaseService
private userLogOutUseCaseService: UserLogOutUseCaseService,
private userRefreshTokenService: UserRefreshTokenService
) { }
@@ -19,7 +21,7 @@ export class UserService {
const result = await this.userLoginUseCaseService.execute(input)
if(result.isOk()) {
// SessionStore.reset(new UserEntity({...result.value, ...result.value.user}))
}
@@ -29,4 +31,8 @@ export class UserService {
async logout() {
return await this.userLogOutUseCaseService.execute()
}
refreshToken() {
return this.userRefreshTokenService.execute()
}
}
+13 -7
View File
@@ -3,6 +3,11 @@ import { HttpModule } from 'src/app/infra/http/http.module';
import { IUserRemoteRepository } from 'src/app/core/user/repository/user-remote-repository';
import { UserRemoteRepositoryService } from './data/datasource/user-remote-repository.service';
import { UserService } from './domain/user.service'
import { UserLoginUseCaseService } from 'src/app/core/user/use-case/user-login-use-case.service';
import { UserLogOutUseCaseService } from 'src/app/core/user/use-case/user-log-out-use-case.service';
import { UserRefreshTokenService } from 'src/app/core/user/use-case/user-refresh-token.service';
@NgModule({
imports: [HttpModule],
providers: [
@@ -10,18 +15,19 @@ import { UserService } from './domain/user.service'
provide: IUserRemoteRepository,
useClass: UserRemoteRepositoryService, // or MockDataService
},
// domain service
UserService,
// use case
UserLoginUseCaseService,
UserLogOutUseCaseService,
UserRefreshTokenService
],
declarations: [],
schemas: [],
entryComponents: [
]
],
})
export class UserModule {
constructor(
private UserService:UserService
) {}
constructor() {}
}