hardi
/
opt-cc
1
0
Fork 0
Code Pull Requests Releases 47 Activity

Use store for war and use depending loading on url resolving (CC-62)

pull/46/head
HardiReady 2018-10-09 10:42:28 +02:00
parent bb69907447
commit b425617a7d
12 changed files with 142 additions and 106 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
api/routes/campaigns.js
View File

@ -63,6 +63,21 @@ campaigns.route('/')
routerHandling.httpMethodNotAllowed
);
campaigns.route('/with/war/:id')
.get((req, res, next) => {
WarModel.findById(req.params.id, (err, item) => {
if (err) {
err.status = codes.servererror;
return next(err);
}
return genericGetById({params: {id: item.campaign}}, res, next, CampaignModel);
});
})
.all(
routerHandling.httpMethodNotAllowed
);
campaigns.route('/:id')
.get(idValidator, (req, res, next) => {
return genericGetById(req, res, next, CampaignModel);

35
api/routes/wars.js
View File

@ -23,7 +23,6 @@ const resourceLocation = require('../middleware/resource-location').resourceLoca
const parseWarLog = require('../tools/log-parse-tool');
// Mongoose Model using mongoDB
const CampaignModel = require('../models/campaign');
const WarModel = require('../models/war');
const PlayerModel = require('../models/player');
const LogKillModel = require('../models/logs/kill');
@ -43,36 +42,18 @@ const wars = new express.Router();
// routes **********************
wars.route('/')
.get((req, res, next) => {
let result = [];
CampaignModel.find({}, {}, {sort: {timestamp: 'desc'}}, (err, campaigns) => {
const filter = {};
if (req.query.campaignId) {
filter.campaign = req.query.campaignId;
}
WarModel.find(filter, {}, {sort: {date: 'desc'}}, (err, wars) => {
if (err) {
err.status = codes.servererror;
return next(err);
}
if (campaigns) {
WarModel.find({}, {}, {sort: {date: 'desc'}}, (err, wars) => {
if (err) {
err.status = codes.servererror;
return next(err);
}
if (wars) {
campaigns.forEach((campaign) => {
let entry = {_id: campaign._id, title: campaign.title, wars: []};
wars.forEach((war) => {
if (String(campaign._id) === String(war.campaign)) {
entry.wars.push(war);
}
});
result.push(entry);
});
res.locals.items = result;
}
res.locals.processed = true;
next();
}
)
;
}
res.locals.items = wars;
res.locals.processed = true;
next();
});
})

4
static/src/app/models/model-interfaces.ts
View File

@ -1,3 +1,5 @@
import {Observable} from 'rxjs';
export interface AppUser {
_id?: string;
username?: string;
@ -43,7 +45,7 @@ export interface CampaignPlayer {
export interface Campaign {
_id?: string;
title?: string;
wars?: War[];
wars$?: Observable<War[]>;
}
export interface War {

16
static/src/app/services/logs/campaign.service.ts
View File

@ -20,20 +20,20 @@ export class CampaignService {
getAllCampaigns() {
return this.http.get(this.config.apiCampaignPath)
.map(res => res.json());
}
getAllCampaignsWithWars() {
return this.http.get(this.config.apiWarPath)
.map(res => res.json())
.do((ranks) => this.campaignStore.dispatch({type: LOAD, data: ranks}))
.map(res => res.json())
.do((ranks) => this.campaignStore.dispatch({type: LOAD, data: ranks}));
}
getCampaign(id: string) {
return this.http.get(this.config.apiCampaignPath + '/' + id)
return this.http.get(`${this.config.apiCampaignPath}/${id}`)
.map(res => res.json());
}
getCampaignByWarId(warId) {
return this.http.get(`${this.config.apiCampaignPath}/with/war/${warId}`)
.map((res) => res.json());
}
submitCampaign(campaign: Campaign) {
let requestUrl: string;
let requestMethod: RequestMethod

34
static/src/app/services/logs/war.service.ts
View File

@ -2,12 +2,29 @@ import {Injectable} from '@angular/core';
import {War} from '../../models/model-interfaces';
import {AppConfig} from '../../app.config';
import {HttpClient} from '../http-client';
import {ADD, EDIT, LOAD, REMOVE, Store} from '../stores/generic-store';
import {Observable} from 'rxjs';
@Injectable()
export class WarService {
wars$: Observable<War[]>;
warStore = new Store<War>();
constructor(private http: HttpClient,
private config: AppConfig) {
this.wars$ = this.warStore.items$;
}
getAllWars(campaignId?: string) {
let targetUrl = this.config.apiWarPath;
if (campaignId) {
targetUrl += `?campaignId=${campaignId}`
}
return this.http.get(targetUrl)
.map(res => res.json())
.do((wars) => this.warStore.dispatch({type: LOAD, data: wars}));
}
getWar(warId: string) {
@ -15,7 +32,6 @@ export class WarService {
.map(res => res.json());
}
submitWar(war: War, logFile?) {
let body;
@ -30,17 +46,19 @@ export class WarService {
}
return this.http.post(this.config.apiWarPath, body)
.map(res => res.json());
}
deleteWar(id: string) {
return this.http.delete(this.config.apiWarPath + '/' + id)
.map(res => res.json());
.map(res => res.json())
.do((newWar) => this.warStore.dispatch({type: ADD, data: newWar}));
}
updateWar(war: War) {
return this.http.patch(this.config.apiWarPath + '/' + war._id, war)
.map(res => res.json());
.map(res => res.json())
.do((updatedWar) => this.warStore.dispatch({type: EDIT, data: updatedWar}));
}
deleteWar(war: War) {
return this.http.delete(this.config.apiWarPath + '/' + war._id)
.do((emptyRes) => this.warStore.dispatch({type: REMOVE, data: war}));
}
}

2
static/src/app/statistic/campaign/overview/campaign-overview.component.html
View File

@ -14,7 +14,7 @@
</mat-button-toggle-group>
</div>
<div class="fade-in">
<div class="fade-in" *ngIf="initialized">
<div class="slide-chart-container">
<ngx-charts-line-chart
[scheme]="colorScheme"

42
static/src/app/statistic/campaign/overview/campaign-overview.component.ts
View File

@ -1,8 +1,9 @@
import {Component, Input, OnInit} from '@angular/core';
import {Component, OnInit} from '@angular/core';
import {ActivatedRoute} from '@angular/router';
import {CampaignService} from '../../../services/logs/campaign.service';
import {ChartUtils} from '../../../utils/chart-utils';
import {Fraction} from '../../../utils/fraction.enum';
import {WarService} from '../../../services/logs/war.service';
@Component({
@ -12,10 +13,9 @@ import {Fraction} from '../../../utils/fraction.enum';
})
export class StatisticOverviewComponent implements OnInit {
@Input() campaigns;
id: string;
id = '';
title = '';
initialized = false;
pointData: any[] = [];
pointSumData: any[] = [];
@ -38,7 +38,8 @@ export class StatisticOverviewComponent implements OnInit {
timeline = false;
constructor(private route: ActivatedRoute,
private campaignService: CampaignService) {
private campaignService: CampaignService,
private warService: WarService) {
}
ngOnInit() {
@ -46,26 +47,21 @@ export class StatisticOverviewComponent implements OnInit {
.map(params => params['id'])
.subscribe((id) => {
this.id = id;
this.campaignService.getAllCampaignsWithWars().subscribe(campaigns => {
this.initWars(campaigns);
});
this.initWars();
});
}
initWars(campaigns) {
let wars = [];
let itemsProcessed = 0;
campaigns = campaigns.filter(campaign => this.id === 'all' || campaign._id === this.id);
campaigns.forEach(campaign => {
wars = wars.concat(campaign.wars);
itemsProcessed++;
if (itemsProcessed === campaigns.length) {
if (this.id === 'all') {
this.timeline = true;
}
initWars() {
if (this.id === 'all') {
this.warService.getAllWars().subscribe((wars) => {
this.initChart(wars);
}
});
});
this.timeline = true;
} else {
this.warService.wars$.subscribe((wars) => {
this.initChart(wars);
})
}
}
goToSlide(index) {
@ -137,5 +133,9 @@ export class StatisticOverviewComponent implements OnInit {
this.goToSlide(1);
}
Object.assign(this, this.currentData);
setTimeout(() => {
this.initialized = true;
}, 250);
}
}

41
static/src/app/statistic/stats.component.ts
View File

@ -4,6 +4,7 @@ import {CampaignService} from '../services/logs/campaign.service';
import {ActivatedRoute, Router} from '@angular/router';
import {TranslateService} from '@ngx-translate/core';
import {SettingsService} from '../services/settings.service';
import {WarService} from '../services/logs/war.service';
@Component({
selector: 'cc-stats',
@ -19,6 +20,7 @@ export class StatisticComponent implements OnInit {
collapsed = false;
constructor(private campaignService: CampaignService,
private warService: WarService,
private router: Router,
private route: ActivatedRoute,
private translate: TranslateService,
@ -27,11 +29,12 @@ export class StatisticComponent implements OnInit {
}
ngOnInit() {
this.campaignService.getAllCampaignsWithWars().filter(c => c.length !== 0).subscribe((campaigns) => {
this.campaigns = campaigns;
this.selectedCampaign = this.resolveCampaignFromUrl();
this.switchCampaign(this.selectedCampaign);
});
this.campaignService.getAllCampaigns()
.filter(campaigns => campaigns.length !== 0)
.subscribe((campaigns) => {
this.campaigns = campaigns;
this.resolveCampaignFromUrl();
});
}
resolveCampaignFromUrl() {
@ -42,25 +45,33 @@ export class StatisticComponent implements OnInit {
if (url.includes('right:overview') || url.includes('right:highscore')) {
const id = idFetchPattern.exec(url)[1];
if (id === 'all') {
return {_id: id}
this.switchCampaign({_id: id});
}
const filteredCampaigns = this.campaigns.filter(c => c._id === id);
if (filteredCampaigns.length === 1) {
return filteredCampaigns[0];
this.switchCampaign(filteredCampaigns[0]);
}
}
if (url.includes('right:war')) {
} else if (url.includes('right:war')) {
const id = idFetchPattern.exec(url)[1];
const filteredCampaigns = this.campaigns.filter(c => c.wars.filter(war => war._id === id).length > 0);
if (filteredCampaigns.length === 1) {
return filteredCampaigns[0];
}
console.log(id)
this.campaignService.getCampaignByWarId(id).subscribe((campaign) => {
this.switchCampaign(campaign);
});
} else {
this.switchCampaign(this.campaigns[0]);
}
return this.campaigns[0]
}
switchCampaign(campaign) {
this.selectedCampaign = campaign;
if (campaign._id !== 'all') {
campaign.wars$ = this.warService.wars$;
this.warService.getAllWars(campaign._id).subscribe((wars) => {
this.selectedCampaign = campaign;
});
} else {
this.selectedCampaign = campaign;
}
if (campaign._id === 'all' || this.router.url.includes('/overview/all')) {
setTimeout(_ => {
window.dispatchEvent(new Event('resize'));

2
static/src/app/statistic/war/war-list/war-list.component.html
View File

@ -37,7 +37,7 @@
</div>
<div class="battle-list">
<div *ngFor="let war of campaign.wars">
<div *ngFor="let war of campaign.wars$ | async">
<cc-war-item
[war]="war"
(warEdit)="editWar($event)"

3
static/src/app/statistic/war/war-list/war-list.component.ts
View File

@ -107,12 +107,11 @@ export class WarListComponent implements OnChanges {
this.translate.get('stats.sidebar.battle.manage.delete.confirm', {title: war.title})
.subscribe((confirmQuestion: string) => {
if (confirm(confirmQuestion)) {
this.warService.deleteWar(war._id)
this.warService.deleteWar(war)
.subscribe((res) => {
if (this.selectedWarId === war._id) {
this.selectOverview('all');
}
this.campaign.wars.splice(this.campaign.wars.indexOf(war), 1);
});
}
});

2
static/src/app/statistic/war/war-submit/war-submit.component.html
View File

@ -88,7 +88,7 @@
<button id="save"
type="submit"
*ngIf="!loading"
(click)="war._id ? editWar() : saveWar()"
(click)="submitWar()"
class="btn btn-default"
[disabled]="!form.valid">
{{'stats.war.submit.button.submit' | translate}}

52
static/src/app/statistic/war/war-submit/war-submit.component.ts
View File

@ -61,29 +61,39 @@ export class WarSubmitComponent {
}
}
saveWar() {
if (!this.fileList) {
this.translate.get('stats.war.submit.logfile').subscribe((fieldNameLogfile) => {
this.translate.get('public.error.message.required',
{fieldName: fieldNameLogfile}).subscribe((message) => {
this.snackBarService.showError(message, 4000);
submitWar() {
if (this.war._id) {
this.warService.updateWar(this.war).subscribe((updatedWar) => {
this.router.navigate(['../../war/' + updatedWar._id], {relativeTo: this.route});
},
(error) => {
const errorMsg = JSON.parse(error._body).error.message;
this.snackBarService.showError('Error: '.concat(errorMsg), 15000);
}
);
} else {
if (!this.fileList) {
this.translate.get('stats.war.submit.logfile').subscribe((fieldNameLogfile) => {
this.translate.get('public.error.message.required',
{fieldName: fieldNameLogfile}).subscribe((message) => {
this.snackBarService.showError(message, 4000);
})
})
})
}
const file: File = this.fileList[0];
this.loading = true;
this.spinnerService.activate();
this.warService.submitWar(this.war, file)
.subscribe(war => {
this.router.navigate(['../war/' + war._id], {relativeTo: this.route});
},
error => {
this.spinnerService.deactivate();
this.loading = false;
const errorMsg = JSON.parse(error._body).error.message;
this.snackBarService.showError('Error: '.concat(errorMsg), 15000);
});
}
const file: File = this.fileList[0];
this.loading = true;
this.spinnerService.activate();
this.warService.submitWar(this.war, file)
.subscribe(war => {
this.router.navigate(['../war/' + war._id], {relativeTo: this.route});
},
error => {
this.spinnerService.deactivate();
this.loading = false;
const errorMsg = JSON.parse(error._body).error.message;
this.snackBarService.showError('Error: '.concat(errorMsg), 15000);
});
}
cancel() {