SES-160 game-master page

This commit is contained in:
Łukasz Góreczny 2021-01-22 21:15:19 +01:00
parent ba91bea4ea
commit 0a5b7a06f4
13 changed files with 540 additions and 22 deletions

View File

@ -42,14 +42,14 @@ namespace SessionCompanion.Services.Services
await Repository.Update(shopkeeper); await Repository.Update(shopkeeper);
} }
await Repository.Save(); await Repository.Save();
return new SuccessResponse("Shopkeepers updated") { StatusCode = 200 }; return new SuccessResponse(200, "Shopkeepers updated");
} }
var newActiveShopkeeper = shopkeepers.Where(c => c.Id.Equals(shopkeeperId)).Single(); var newActiveShopkeeper = shopkeepers.Where(c => c.Id.Equals(shopkeeperId)).Single();
newActiveShopkeeper.IsAvailable = false; newActiveShopkeeper.IsAvailable = false;
await Repository.Update(newActiveShopkeeper); await Repository.Update(newActiveShopkeeper);
await Repository.Save(); await Repository.Save();
return new SuccessResponse("Shopkeepers updated") { StatusCode = 200 }; return new SuccessResponse(200, "Shopkeepers updated");
} }
catch (Exception e) catch (Exception e)
{ {
@ -61,7 +61,7 @@ namespace SessionCompanion.Services.Services
{ {
try try
{ {
var activeShopkeeper = await Repository.Get(c => c.IsAvailable.Equals(true)).SingleAsync(); var activeShopkeeper = await Repository.Get(c => c.IsAvailable.Equals(true)).FirstOrDefaultAsync();
if (activeShopkeeper != null && shopkeeperWithItemsViewModel.IsAvailable) if (activeShopkeeper != null && shopkeeperWithItemsViewModel.IsAvailable)
{ {
activeShopkeeper.IsAvailable = false; activeShopkeeper.IsAvailable = false;

View File

@ -28,6 +28,7 @@ import {
MatDialogModule, MatDialogModule,
MatTooltipModule, MatTooltipModule,
MatSnackBarModule, MatSnackBarModule,
MatStepperModule,
} from '@angular/material'; } from '@angular/material';
import { UserService } from '../services/user.service'; import { UserService } from '../services/user.service';
import { StoreModule } from '@ngrx/store'; import { StoreModule } from '@ngrx/store';
@ -52,7 +53,7 @@ import { MonsterService } from '../services/monster.service';
import { SpellDetailsDialogComponent } from './components/spell-details-dialog/spell-details-dialog.component'; import { SpellDetailsDialogComponent } from './components/spell-details-dialog/spell-details-dialog.component';
import { GameMasterShopkeepersTableComponent } from './components/game-master-shopkeepers-table/game-master-shopkeepers-table.component'; import { GameMasterShopkeepersTableComponent } from './components/game-master-shopkeepers-table/game-master-shopkeepers-table.component';
import { PlayerWeaponsTableComponent } from './components/player-weapons-table/player-weapons-table.component'; import { PlayerWeaponsTableComponent } from './components/player-weapons-table/player-weapons-table.component';
import {EquipmentService} from "../services/equipment.service"; import { EquipmentService } from '../services/equipment.service';
import { PlayerArmorsTableComponent } from './components/player-armors-table/player-armors-table.component'; import { PlayerArmorsTableComponent } from './components/player-armors-table/player-armors-table.component';
import { PlayerOtherEquipmentTableComponent } from './components/player-other-equipment-table/player-other-equipment-table.component'; import { PlayerOtherEquipmentTableComponent } from './components/player-other-equipment-table/player-other-equipment-table.component';
import { SendMessageActionComponent } from './components/game-master-character-actions-dialog/actions-components/send-message-action/send-message-action.component'; import { SendMessageActionComponent } from './components/game-master-character-actions-dialog/actions-components/send-message-action/send-message-action.component';
@ -63,6 +64,7 @@ import { GameMasterTurntrackerComponent } from './components/game-master-turntra
import { DragDropModule } from '@angular/cdk/drag-drop'; import { DragDropModule } from '@angular/cdk/drag-drop';
import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog/choose-monster-dialog.component'; import { ChooseMonsterDialogComponent } from './components/choose-monster-dialog/choose-monster-dialog.component';
import { ShopkeeperService } from '../services/shopkeeper.service'; import { ShopkeeperService } from '../services/shopkeeper.service';
import { NewShopkeeperDialogComponent } from './components/game-master-shopkeepers-table/shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component';
@NgModule({ @NgModule({
declarations: [ declarations: [
@ -91,6 +93,7 @@ import { ShopkeeperService } from '../services/shopkeeper.service';
MessageDialogComponent, MessageDialogComponent,
GameMasterTurntrackerComponent, GameMasterTurntrackerComponent,
ChooseMonsterDialogComponent, ChooseMonsterDialogComponent,
NewShopkeeperDialogComponent,
], ],
imports: [ imports: [
BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }), BrowserModule.withServerTransition({ appId: 'ng-cli-universal' }),
@ -122,6 +125,7 @@ import { ShopkeeperService } from '../services/shopkeeper.service';
DynamicModule, DynamicModule,
MatSnackBarModule, MatSnackBarModule,
DragDropModule, DragDropModule,
MatStepperModule,
], ],
providers: [ providers: [
UserService, UserService,
@ -153,6 +157,7 @@ import { ShopkeeperService } from '../services/shopkeeper.service';
MessageDialogComponent, MessageDialogComponent,
GameMasterTurntrackerComponent, GameMasterTurntrackerComponent,
ChooseMonsterDialogComponent, ChooseMonsterDialogComponent,
NewShopkeeperDialogComponent,
], ],
}) })
export class AppModule {} export class AppModule {}

View File

@ -42,3 +42,9 @@ button {
.mat-column-actions { .mat-column-actions {
text-align: center; text-align: center;
} }
.add-new-shopkeeper-button {
float: right;
color: whitesmoke;
border-color: whitesmoke;
}

View File

@ -20,10 +20,10 @@
(click)="DeactivateShopkeeper(row.id)"> (click)="DeactivateShopkeeper(row.id)">
Deactivate Deactivate
</button> </button>
<button mat-flat-button *ngIf="!row.isAvailable" color="green" (click)="ActivateShopkeeper(row.id)"> <button mat-flat-button *ngIf="!isAnyAvailable" color="green" (click)="ActivateShopkeeper(row.id)">
Activate Activate
</button> </button>
<button mat-flat-button color="warn" > <button mat-flat-button color="warn" (click)="RemoveShopkeeper(row.id)">
Remove Remove
</button> </button>
@ -40,3 +40,7 @@
<mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator> <mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
</div> </div>
<button mat-stroked-button class="add-new-shopkeeper-button" (click)="AddNewShopkeeper()">
Add new
</button>

View File

@ -8,6 +8,8 @@ import { ShopkeeperService } from '../../../services/shopkeeper.service';
import { first } from 'rxjs/operators'; import { first } from 'rxjs/operators';
import { ErrorResponse } from '../../../types/ErrorResponse'; import { ErrorResponse } from '../../../types/ErrorResponse';
import { HttpErrorResponse } from '@angular/common/http'; import { HttpErrorResponse } from '@angular/common/http';
import { MatDialog } from '@angular/material';
import { NewShopkeeperDialogComponent } from './shopkeeper-dialogs/new-shopkeeper-dialog/new-shopkeeper-dialog.component';
@Component({ @Component({
selector: 'app-game-master-shopkeepers-table', selector: 'app-game-master-shopkeepers-table',
@ -17,13 +19,21 @@ import { HttpErrorResponse } from '@angular/common/http';
export class GameMasterShopkeepersTableComponent implements OnInit { export class GameMasterShopkeepersTableComponent implements OnInit {
displayedColumns: string[] = ['name', 'actions']; displayedColumns: string[] = ['name', 'actions'];
dataSource: MatTableDataSource<ShopkeeperViewModel>; dataSource: MatTableDataSource<ShopkeeperViewModel>;
isAnyAvailable: boolean = false;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator; @ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort; @ViewChild(MatSort, { static: true }) sort: MatSort;
constructor(private shopkeeperService: ShopkeeperService) {} constructor(
private shopkeeperService: ShopkeeperService,
public dialog: MatDialog
) {}
ngOnInit() { ngOnInit() {
this.GetAllShopkeepers();
}
GetAllShopkeepers() {
this.shopkeeperService this.shopkeeperService
.GetAllShopkeepers() .GetAllShopkeepers()
.pipe(first()) .pipe(first())
@ -32,6 +42,9 @@ export class GameMasterShopkeepersTableComponent implements OnInit {
this.dataSource = new MatTableDataSource(result); this.dataSource = new MatTableDataSource(result);
this.dataSource.sort = this.sort; this.dataSource.sort = this.sort;
this.dataSource.paginator = this.paginator; this.dataSource.paginator = this.paginator;
if (result.find((e) => e.isAvailable) != null) {
this.isAnyAvailable = true;
}
}, },
(error: ErrorResponse | HttpErrorResponse) => { (error: ErrorResponse | HttpErrorResponse) => {
console.error(error); console.error(error);
@ -44,15 +57,80 @@ export class GameMasterShopkeepersTableComponent implements OnInit {
} }
ActivateShopkeeper(shopkeeperId: number) { ActivateShopkeeper(shopkeeperId: number) {
if (this.dataSource.data.find((e) => e.isAvailable) != null) { this.shopkeeperService
this.dataSource.data.find((e) => e.id == shopkeeperId).isAvailable = true; .ChangeShopkeeperStatus(shopkeeperId, true)
this.shopkeeperService.ChangeShopkeeperStatus(shopkeeperId, true); .pipe(first())
} .subscribe(
(result) => {
this.dataSource.data.find(
(e) => e.id == shopkeeperId
).isAvailable = true;
this.isAnyAvailable = true;
},
(error: ErrorResponse | HttpErrorResponse) => {
console.error(error);
if (error instanceof HttpErrorResponse) {
error = error.error as ErrorResponse;
}
console.error(error.message);
}
);
} }
DeactivateShopkeeper(shopkeeperId: number) { DeactivateShopkeeper(shopkeeperId: number) {
this.dataSource.data.find((e) => e.id == shopkeeperId).isAvailable = false; this.shopkeeperService
this.shopkeeperService.ChangeShopkeeperStatus(shopkeeperId, false); .ChangeShopkeeperStatus(shopkeeperId, false)
.pipe(first())
.subscribe(
(result) => {
this.dataSource.data.find(
(e) => e.id == shopkeeperId
).isAvailable = false;
this.isAnyAvailable = false;
},
(error: ErrorResponse | HttpErrorResponse) => {
console.error(error);
if (error instanceof HttpErrorResponse) {
error = error.error as ErrorResponse;
}
console.error(error.message);
}
);
}
RemoveShopkeeper(shopkeeperId: number) {
let currentStatus = this.dataSource.data.find((e) => e.id == shopkeeperId)
.isAvailable;
this.shopkeeperService
.RemoveShopkeeper(shopkeeperId, currentStatus)
.pipe(first())
.subscribe(
(result) => {
if (currentStatus == true) {
this.isAnyAvailable = false;
}
this.dataSource.data = this.dataSource.data.filter(
(e) => e.id != shopkeeperId
);
},
(error: ErrorResponse | HttpErrorResponse) => {
console.error(error);
if (error instanceof HttpErrorResponse) {
error = error.error as ErrorResponse;
}
console.error(error.message);
}
);
}
AddNewShopkeeper() {
this.dialog
.open(NewShopkeeperDialogComponent)
.afterClosed()
.pipe(first())
.subscribe(() => {
this.GetAllShopkeepers();
});
} }
applyFilter(event: Event) { applyFilter(event: Event) {

View File

@ -0,0 +1,62 @@
::ng-deep .mat-horizontal-content-container {
overflow-y: auto !important;
max-height: 500px;
}
table {
background-color: initial;
}
mat-paginator {
background-color: initial;
color: white;
}
::ng-deep .mat-select-arrow {
color: whitesmoke;
}
::ng-deep .mat-select-value {
color: white;
}
.button-to-right {
float: right;
}
.button-to-right > button {
color: whitesmoke;
}
td,
th {
color: whitesmoke;
}
.shopkeeper-create-button {
color: #7bce7b !important;
}
.shopkeeper-stepper-main {
background-color: #4f5c69;
}
::ng-deep .mat-step-label {
color: white !important;
}
::ng-deep .mat-step-icon-selected {
background-color: #df7c0f !important;
}
::ng-deep .mat-step-icon-state-edit {
background-color: #df7c0f !important;
}
::ng-deep mat-dialog-container {
background-color: #4f5c69 !important;
}
::ng-deep .mat-checkbox-checked.mat-accent .mat-checkbox-background {
background-color: #df7c0f;
}

View File

@ -0,0 +1,104 @@
<mat-horizontal-stepper [linear]="true" #stepper class="shopkeeper-stepper-main">
<mat-step [stepControl]="nameFormGroup">
<form [formGroup]="nameFormGroup">
<ng-template matStepLabel class="stepper-header">Fill out your shop name</ng-template>
<mat-form-field>
<mat-label>Name</mat-label>
<input matInput placeholder="Bob..." formControlName="name" required>
</mat-form-field>
</form>
<div class="button-to-right">
<button mat-button matStepperNext>Next</button>
</div>
</mat-step>
<mat-step>
<ng-template matStepLabel>Select items</ng-template>
<div class="mat-elevation-z8">
<table mat-table [dataSource]="dataSourceWithAllitems" matSort class="w-100">
<ng-container matColumnDef="select">
<th mat-header-cell *matHeaderCellDef> Select
</th>
<td mat-cell *matCellDef="let row">
<mat-checkbox (click)="$event.stopPropagation()"
(change)="$event ? selection.toggle(row) : null"
[checked]="selection.isSelected(row)">
</mat-checkbox>
</td>
</ng-container>
<ng-container matColumnDef="itemName">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let row"> {{row.itemName}} </td>
</ng-container>
<ng-container matColumnDef="itemType">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Type </th>
<td mat-cell *matCellDef="let row"> {{row.itemType}} </td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumns"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumns;"></tr>
<tr class="mat-row" *matNoDataRow>
<td class="mat-cell" colspan="4">No data found</td>
</tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
</div>
<div class="button-to-right">
<button mat-button matStepperPrevious>Back</button>
<button mat-button (click)="ToFinalStep(stepper)" >Next</button>
</div>
</mat-step>
<mat-step>
<ng-template matStepLabel>Set a quantity</ng-template>
<div class="mat-elevation-z8">
<table mat-table [dataSource]="finalDataSource" matSort class="w-100">
<ng-container matColumnDef="itemName">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Name </th>
<td mat-cell *matCellDef="let row"> {{row.itemName}} </td>
</ng-container>
<ng-container matColumnDef="itemType">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Type </th>
<td mat-cell *matCellDef="let row"> {{row.itemType}} </td>
</ng-container>
<ng-container matColumnDef="amount" >
<th mat-header-cell *matHeaderCellDef mat-sort-header > Amount </th>
<td mat-cell *matCellDef="let row">
<mat-form-field style="width: 60px">
<input matInput type="number" [(ngModel)]="row.amount" min="1">
</mat-form-field>
</td>
</ng-container>
<ng-container matColumnDef="actions">
<th mat-header-cell *matHeaderCellDef mat-sort-header> Remove </th>
<td mat-cell *matCellDef="let row">
<button mat-icon-button (click)="RemoveItem(row.weaponId, row.armorId)">
<mat-icon>delete</mat-icon>
</button>
</td>
</ng-container>
<tr mat-header-row *matHeaderRowDef="displayedColumnsForFinal"></tr>
<tr mat-row *matRowDef="let row; columns: displayedColumnsForFinal;"></tr>
<tr class="mat-row" *matNoDataRow>
<td class="mat-cell" colspan="4">No data found</td>
</tr>
</table>
<mat-paginator [pageSizeOptions]="[5, 10, 25, 100]"></mat-paginator>
</div>
<div class="button-to-right">
<button mat-button matStepperPrevious>Back</button>
<button mat-button (click)="CreateShopkeeper()" class="shopkeeper-create-button">Create</button>
</div>
</mat-step>
</mat-horizontal-stepper>

View File

@ -0,0 +1,170 @@
import { Component, OnInit, ViewChild } from '@angular/core';
import { MatTableDataSource } from '@angular/material/table';
import { MatPaginator } from '@angular/material/paginator';
import { MatSort } from '@angular/material/sort';
import { FormBuilder, FormGroup, Validators } from '@angular/forms';
import { WeaponService } from '../../../../../services/weapon.service';
import { ArmorService } from '../../../../../services/armor.service';
import { ShopkeeperItemsWithItemNameAndTypeViewModel } from '../../../../../types/viewmodels/shopkeeper-viewmodels/ShopkeeperItemsWithItemNameAndTypeViewModel';
import { first, map } from 'rxjs/operators';
import { forkJoin, Observable } from 'rxjs';
import { SelectionModel } from '@angular/cdk/collections';
import {
MatDialog,
MatDialogRef,
MatHorizontalStepper,
} from '@angular/material';
import { ShopkeeperService } from '../../../../../services/shopkeeper.service';
import { ShopkeeperWithItemsViewModel } from '../../../../../types/viewmodels/shopkeeper-viewmodels/ShopkeeperWithItemsViewModel';
import { ShopkeeperItemsViewModel } from '../../../../../types/viewmodels/shopkeeper-viewmodels/ShopkeeperItemsViewModel';
@Component({
selector: 'app-new-shopkeeper-dialog',
templateUrl: './new-shopkeeper-dialog.component.html',
styleUrls: ['./new-shopkeeper-dialog.component.css'],
})
export class NewShopkeeperDialogComponent implements OnInit {
displayedColumnsForFinal: string[] = [
'itemName',
'itemType',
'amount',
'actions',
];
displayedColumns: string[] = ['select', 'itemName', 'itemType'];
dataSourceWithAllitems: MatTableDataSource<ShopkeeperItemsWithItemNameAndTypeViewModel>;
selection = new SelectionModel<ShopkeeperItemsWithItemNameAndTypeViewModel>(
true,
[]
);
finalDataSource: MatTableDataSource<ShopkeeperItemsWithItemNameAndTypeViewModel>;
nameFormGroup: FormGroup;
@ViewChild(MatPaginator, { static: true }) paginator: MatPaginator;
@ViewChild(MatSort, { static: true }) sort: MatSort;
@ViewChild(MatPaginator, { static: true }) paginatorForFinal: MatPaginator;
@ViewChild(MatSort, { static: true }) sortForFinal: MatSort;
constructor(
private formBuilder: FormBuilder,
private weaponService: WeaponService,
private armorService: ArmorService,
private shopkeeperService: ShopkeeperService,
public dialogRef: MatDialogRef<NewShopkeeperDialogComponent>
) {}
ngOnInit() {
this.GetAllWeaponsAndArmors()
.pipe(first())
.subscribe((res) => {
this.dataSourceWithAllitems = new MatTableDataSource<ShopkeeperItemsWithItemNameAndTypeViewModel>(
res
);
this.dataSourceWithAllitems.sort = this.sort;
this.dataSourceWithAllitems.paginator = this.paginator;
});
this.finalDataSource = new MatTableDataSource<ShopkeeperItemsWithItemNameAndTypeViewModel>(
[]
);
this.finalDataSource.paginator = this.paginatorForFinal;
this.finalDataSource.sort = this.sortForFinal;
this.nameFormGroup = this.formBuilder.group({
name: ['', Validators.required],
});
}
GetAllWeaponsAndArmors(): Observable<
ShopkeeperItemsWithItemNameAndTypeViewModel[]
> {
return forkJoin([
this.armorService.GetAllArmors(),
this.weaponService.GetAllWeapons(),
]).pipe(
first(),
map(([armors, weapons]) => {
let resultArray: ShopkeeperItemsWithItemNameAndTypeViewModel[];
resultArray = weapons.map<ShopkeeperItemsWithItemNameAndTypeViewModel>(
(e) => {
return {
shopkeeperId: null,
amount: 1,
armorId: null,
weaponId: e.id,
itemName: e.name,
itemType: 'Weapon',
};
}
);
return [
...resultArray,
...armors.map<ShopkeeperItemsWithItemNameAndTypeViewModel>((e) => {
return {
shopkeeperId: null,
amount: 1,
armorId: null,
weaponId: e.id,
itemName: e.name,
itemType: 'Armor',
};
}),
];
})
);
}
ToFinalStep(stepper: MatHorizontalStepper) {
this.selection.selected.forEach((item) => {
if (
this.finalDataSource.data.filter(
(e) => e.armorId == item.armorId && e.weaponId == item.weaponId
).length == 0
) {
this.finalDataSource.data = [...this.finalDataSource.data, item];
}
});
this.selection.clear();
stepper.next();
}
CreateShopkeeper() {
if (this.finalDataSource.data.length > 0) {
let filteredData = this.finalDataSource.data.filter((e) => e.amount > 0);
let shopkeeperModel: ShopkeeperWithItemsViewModel = {
id: null,
name: this.nameFormGroup.value.name,
isAvailable: false,
items: filteredData.map<ShopkeeperItemsViewModel>((item) => {
return {
shopkeeperId: null,
armorId: item.armorId,
weaponId: item.weaponId,
amount: item.amount,
};
}),
};
this.shopkeeperService
.CreateShopkeeper(shopkeeperModel)
.pipe(first())
.subscribe((result) => {
this.dialogRef.close();
});
}
}
RemoveItem(weaponId: number, armorId: number) {
if (weaponId != null) {
this.finalDataSource.data = this.finalDataSource.data.filter(
(e) => e.weaponId != weaponId
);
} else if (armorId != null) {
this.finalDataSource.data = this.finalDataSource.data.filter(
(e) => e.armorId != armorId
);
}
}
}

View File

@ -1,5 +1,5 @@
import { Inject, Injectable } from '@angular/core'; import { Inject, Injectable } from '@angular/core';
import { HttpClient, HttpParams } from '@angular/common/http'; import { HttpClient, HttpHeaders, HttpParams } from '@angular/common/http';
import { Observable, of, throwError } from 'rxjs'; import { Observable, of, throwError } from 'rxjs';
import { ShopkeeperViewModel } from '../types/viewmodels/shopkeeper-viewmodels/ShopkeeperViewModel'; import { ShopkeeperViewModel } from '../types/viewmodels/shopkeeper-viewmodels/ShopkeeperViewModel';
import { Either } from '../types/Either'; import { Either } from '../types/Either';
@ -7,6 +7,7 @@ import { ErrorResponse } from '../types/ErrorResponse';
import { switchMap } from 'rxjs/operators'; import { switchMap } from 'rxjs/operators';
import { SuccessResponse } from '../types/SuccessResponse'; import { SuccessResponse } from '../types/SuccessResponse';
import { ShopkeeperWithItemsDetailsViewModel } from '../types/viewmodels/shopkeeper-viewmodels/ShopkeeperWithItemsDetailsViewModel'; import { ShopkeeperWithItemsDetailsViewModel } from '../types/viewmodels/shopkeeper-viewmodels/ShopkeeperWithItemsDetailsViewModel';
import { ShopkeeperWithItemsViewModel } from '../types/viewmodels/shopkeeper-viewmodels/ShopkeeperWithItemsViewModel';
Injectable({ Injectable({
providedIn: 'root', providedIn: 'root',
@ -24,7 +25,6 @@ export class ShopkeeperService {
) )
.pipe( .pipe(
switchMap((response) => { switchMap((response) => {
debugger;
if (response.isLeft) { if (response.isLeft) {
return of(response.left); return of(response.left);
} else { } else {
@ -41,7 +41,6 @@ export class ShopkeeperService {
) )
.pipe( .pipe(
switchMap((response) => { switchMap((response) => {
debugger;
if (response.isLeft) { if (response.isLeft) {
return of(response.left); return of(response.left);
} else { } else {
@ -51,17 +50,82 @@ export class ShopkeeperService {
); );
} }
ChangeShopkeeperStatus(shopkeeperId: number, newStatus: boolean) { CreateShopkeeper(
shopkeeperModel: ShopkeeperWithItemsViewModel
): Observable<SuccessResponse> {
const params = new HttpParams().set(
'shopkeeperWithItemsViewModel',
JSON.stringify(shopkeeperModel)
);
const httpOptions = {
headers: new HttpHeaders({ 'Content-Type': 'application/json' }),
};
console.log(params);
return this.http
.post<Either<SuccessResponse, ErrorResponse>>(
this.baseUrl + 'createNewShopkeeper',
shopkeeperModel,
httpOptions
)
.pipe(
switchMap((response) => {
if (response.isLeft) {
return of(response.left);
} else {
return throwError(response.right);
}
})
);
}
ChangeShopkeeperStatus(
shopkeeperId: number,
newStatus: boolean
): Observable<SuccessResponse> {
const params = new HttpParams() const params = new HttpParams()
.set('shopkeeperId', shopkeeperId.toString()) .set('shopkeeperId', shopkeeperId.toString())
.set('availability', newStatus.toString()); .set('availability', newStatus.toString());
this.http.post(this.baseUrl + 'getShopkeepers', params);
return this.http
.put<Either<SuccessResponse, ErrorResponse>>(
this.baseUrl + 'changeShopkeeperStatus',
null,
{ params }
)
.pipe(
switchMap((response) => {
if (response.isLeft) {
return of(response.left);
} else {
return throwError(response.right);
}
})
);
} }
RemoveShopkeeper(shopkeeperId: number, currentStatus: boolean) { RemoveShopkeeper(
shopkeeperId: number,
currentStatus: boolean
): Observable<SuccessResponse> {
const params = new HttpParams() const params = new HttpParams()
.set('shopkeeperId', shopkeeperId.toString()) .set('shopkeeperId', shopkeeperId.toString())
.set('wasAvailable', currentStatus.toString()); .set('wasAvailable', currentStatus.toString());
this.http.post(this.baseUrl + 'getShopkeepers', params);
return this.http
.delete<Either<SuccessResponse, ErrorResponse>>(
this.baseUrl + 'removeShopkeeper',
{ params }
)
.pipe(
switchMap((response) => {
if (response.isLeft) {
return of(response.left);
} else {
return throwError(response.right);
}
})
);
} }
} }

View File

@ -0,0 +1,6 @@
export interface ShopkeeperItemsViewModel {
shopkeeperId: number;
armorId: number;
weaponId: number;
amount: number;
}

View File

@ -0,0 +1,8 @@
export interface ShopkeeperItemsWithItemNameAndTypeViewModel {
shopkeeperId: number;
armorId: number;
weaponId: number;
amount: number;
itemName: string;
itemType: string;
}

View File

@ -0,0 +1,8 @@
import { ShopkeeperItemsViewModel } from './ShopkeeperItemsViewModel';
export interface ShopkeeperWithItemsViewModel {
id: number;
name: string;
isAvailable: boolean;
items: ShopkeeperItemsViewModel[];
}

View File

@ -55,7 +55,7 @@ namespace SessionCompanion.Controllers
/// <param name="availability"></param> /// <param name="availability"></param>
/// <returns>SuccesResponse/ErrorResponse</returns> /// <returns>SuccesResponse/ErrorResponse</returns>
[HttpPut("changeShopkeeperStatus")] [HttpPut("changeShopkeeperStatus")]
public async Task<Either<SuccessResponse, ErrorResponse>> ChangeShopkeeperStatus([Required] int shopkeeperId, [Required] bool availability) public async Task<Either<SuccessResponse, ErrorResponse>> ChangeShopkeeperStatus([FromQuery][Required] int shopkeeperId, [FromQuery][Required] bool availability)
{ {
var result = await _service.ChangeShopkeeperStatus(shopkeeperId, availability); var result = await _service.ChangeShopkeeperStatus(shopkeeperId, availability);
if (result.IsLeft && availability) if (result.IsLeft && availability)
@ -74,11 +74,14 @@ namespace SessionCompanion.Controllers
public async Task<Either<SuccessResponse, ErrorResponse>> CreateNewShopKeeper([Required] ShopkeeperWithItemsViewModel shopkeeperWithItemsViewModel) public async Task<Either<SuccessResponse, ErrorResponse>> CreateNewShopKeeper([Required] ShopkeeperWithItemsViewModel shopkeeperWithItemsViewModel)
{ {
if (!ModelState.IsValid) if (!ModelState.IsValid)
{
return new ErrorResponse() { StatusCode = 500, Message = "Model is invalid" }; return new ErrorResponse() { StatusCode = 500, Message = "Model is invalid" };
}
return await _service.CreateNewShopKeeper(shopkeeperWithItemsViewModel); return await _service.CreateNewShopKeeper(shopkeeperWithItemsViewModel);
} }
[HttpPost("removeShopkeeper")] [HttpDelete("removeShopkeeper")]
public async Task<Either<SuccessResponse, ErrorResponse>> RemoveShopkeeper([Required] int shopkeeperId, bool wasAvailable) public async Task<Either<SuccessResponse, ErrorResponse>> RemoveShopkeeper([Required] int shopkeeperId, bool wasAvailable)
{ {
await this._service.Delete(shopkeeperId); await this._service.Delete(shopkeeperId);