FE-386: refactoring backend-module (#130)

FE-386: remove .class in filenames

src/app/analytics/analytics.component.ts

@@ -1,6 +1,6 @@
 import { Component, OnInit } from '@angular/core';
 
-import { SelectItem } from 'koffing/common/components/select/select.class';
+import { SelectItem } from 'koffing/common/select/select-item';
 import { AnalyticsService } from 'koffing/analytics/analytics.service';
 
 @Component({

src/app/analytics/analytics.service.ts

@@ -2,10 +2,10 @@ import { Injectable } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 import { Observable } from 'rxjs/Observable';
 
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { SelectItem } from 'koffing/common/components/select/select.class';
+import { Shop } from 'koffing/backend/model/shop';
+import { SelectItem } from 'koffing/common/select/select-item';
 import { ShopIDStorage } from 'koffing/analytics/shop-id-storage.service';
-import { ShopService } from 'koffing/backend/services/shop.service';
+import { ShopService } from 'koffing/backend/shop.service';
 
 @Injectable()
 export class AnalyticsService {

src/app/analytics/dashboard/dashboard.component.ts

@@ -3,9 +3,9 @@ import { ActivatedRoute, Params } from '@angular/router';
 import * as moment from 'moment';
 import { Subject } from 'rxjs/Subject';
 
-import { ShopService } from 'koffing/backend/services/shop.service';
+import { ShopService } from 'koffing/backend/shop.service';
 import { AccountsService } from 'koffing/backend/accounts.service';
-import { DateRange } from '../date-range-selector/date-range.class';
+import { DateRange } from '../date-range-selector/date-range';
 import { PanelData } from '../statistic-panel/panel-data';
 import { DashboardService } from './dashboard.service';
 import { LineChartData } from './stats-data/line-chart-data';

src/app/analytics/dashboard/dashboard.service.ts

@@ -6,8 +6,8 @@ import { LocationService } from 'koffing/backend/location.service';
 import { AnalyticsService } from 'koffing/backend/analytics.service';
 import { DoughnutChartData } from './stats-data/doughnut-chart-data';
 import { StatsDataConverter } from './stats-data/stats-data.converter';
-import { PaymentConversionData } from './stats-data/payment-conversion-data.class';
-import { PaymentRevenueData } from './stats-data/payment-revenue-data.class';
+import { PaymentConversionData } from './stats-data/payment-conversion-data';
+import { PaymentRevenueData } from './stats-data/payment-revenue-data';
 
 @Injectable()
 export class DashboardService {

src/app/analytics/dashboard/stats-data/payment-conversion-data.ts

@@ -1,4 +1,4 @@
-import { PaymentCount } from './payment-count.class';
+import { PaymentCount } from './payment-count';
 import { LineChartData } from './line-chart-data';
 
 export interface PaymentConversionData {

src/app/analytics/dashboard/stats-data/stats-data.converter.ts

@@ -1,11 +1,11 @@
 import { groupBy, keys, round } from 'lodash';
 import * as moment from 'moment';
 
-import { PaymentGeoStat } from 'koffing/backend/model/payment-geo-stat.class';
-import { PaymentMethodStat } from 'koffing/backend/model/payment-method-stat.class';
-import { PaymentConversionStat } from 'koffing/backend/model/payment-conversion-stat.class';
-import { PaymentRevenueStat } from 'koffing/backend/model/payment-revenue-stat.class';
-import { PaymentCount } from './payment-count.class';
+import { PaymentGeoStat } from 'koffing/backend/model/payment-geo-stat';
+import { PaymentMethodStat } from 'koffing/backend/model/payment-method-stat';
+import { PaymentConversionStat } from 'koffing/backend/model/payment-conversion-stat';
+import { PaymentRevenueStat } from 'koffing/backend/model/payment-revenue-stat';
+import { PaymentCount } from './payment-count';
 import { LineChartData } from './line-chart-data';
 import { Dataset } from './dataset';
 import { DoughnutChartData } from './doughnut-chart-data';

src/app/analytics/date-range-selector/date-range-selector.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, Output, EventEmitter, ViewEncapsulation } from '@angular/core';
 
 import * as moment from 'moment';
-import { DateRange } from './date-range.class';
+import { DateRange } from './date-range';
 
 @Component({
     selector: 'kof-date-range-selector',

src/app/analytics/invoices/search-form/search-form.component.ts

@@ -2,7 +2,7 @@ import { Component, Input, Output, OnInit, EventEmitter } from '@angular/core';
 import * as moment from 'moment';
 import { map, clone } from 'lodash';
 
-import { SelectItem } from 'koffing/common/common.module';
+import { SelectItem } from 'koffing/common/select/select-item';
 import { FormSearchParams } from './form-search-params';
 import { invoiceStatuses } from '../invoice-statuses';
 import { paymentStatuses } from '../payment-statuses';

src/app/analytics/invoices/search-result/search-details/create-payment-link.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 import { chain } from 'lodash';
 
-import { ConfigService } from 'koffing/backend/services/config.service';
+import { ConfigService } from 'koffing/backend/config.service';
 import { InvoiceService } from 'koffing/backend/invoice.service';
 import { PaymentLinkArguments } from './payment-link-arguments';
 

src/app/analytics/registry/registry-data.service.ts

@@ -3,14 +3,14 @@ import * as _ from 'lodash';
 import { Observable, Observer } from 'rxjs';
 import 'rxjs/add/observable/forkJoin';
 
-import { ShopService } from 'koffing/backend/services/shop.service';
-import { ContractService } from 'koffing/backend/services/contract.service';
+import { ShopService } from 'koffing/backend/shop.service';
+import { ContractService } from 'koffing/backend/contract.service';
 import { SearchService } from 'koffing/backend/search.service';
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { Contract } from 'koffing/backend/classes/contract.class';
+import { Shop } from 'koffing/backend/model/shop';
+import { Contract } from 'koffing/backend/model/contract';
 import { Invoice } from 'koffing/backend/model/invoice';
 import { Payment } from 'koffing/backend/model/payment';
-import { RussianLegalEntity } from 'koffing/backend/classes/russian-legal-entity.class';
+import { RussianLegalEntity } from 'koffing/backend/model/russian-legal-entity';
 import { SearchPaymentsParams } from 'koffing/backend/requests/search-payments-request';
 import { Registry } from './registry';
 import { RegistryItem } from './registry-item';

src/app/analytics/registry/registry.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 import { ActivatedRoute } from '@angular/router';
 import * as moment from 'moment';
 
-import { DateRange } from '../date-range-selector/date-range.class';
+import { DateRange } from '../date-range-selector/date-range';
 import { RegistryExportService } from './registry-export.service';
 import { RegistryDataService } from './registry-data.service';
 import { ExcelService } from './excel/excel.service';

src/app/analytics/shop-id-storage.service.ts

@@ -1,5 +1,5 @@
 import * as _ from 'lodash';
-import { Shop } from 'koffing/backend/classes/shop.class';
+import { Shop } from 'koffing/backend/model/shop';
 
 export class ShopIDStorage {
 

src/app/app.module.ts

@@ -2,8 +2,8 @@ import { NgModule, APP_INITIALIZER } from '@angular/core';
 import { Http, XHRBackend, RequestOptions, HttpModule } from '@angular/http';
 
 import { RootModule } from './root/root.module';
-import { AuthHttpInterceptor } from './auth/interceptors/auth-http.interceptor';
-import { ConfigService } from './backend/services/config.service';
+import { AuthHttpInterceptor } from './auth/auth-http.interceptor';
+import { ConfigService } from './backend/config.service';
 import { ContainerComponent } from './root/components/container/container.component';
 import { HttpErrorBroadcaster } from 'koffing/broadcaster/services/http-error-broadcaster.service';
 

src/app/auth/auth-http.interceptor.ts

@@ -1,7 +1,7 @@
 import { Http, ConnectionBackend, RequestOptions, Request, RequestOptionsArgs, Response, Headers } from '@angular/http';
 import { Observable } from 'rxjs';
 
-import { AuthService } from '../services/auth.service';
+import { AuthService } from './auth.service';
 import { HttpErrorBroadcaster } from 'koffing/broadcaster/services/http-error-broadcaster.service';
 
 export class AuthHttpInterceptor extends Http {

src/app/auth/auth.module.ts

@@ -1,3 +1,3 @@
-export * from './classes/AuthInfo.class';
-export * from './interceptors/auth-http.interceptor';
-export * from './services/auth.service';
+export * from './auth-info';
+export * from './auth-http.interceptor';
+export * from './auth.service';

src/app/auth/auth.service.ts

@@ -1,4 +1,4 @@
-import { AuthInfo } from '../classes/AuthInfo.class';
+import { AuthInfo } from './auth-info';
 
 declare const Keycloak: any;
 

src/app/backend/accounts.service.ts

@@ -2,15 +2,16 @@ import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 
-import { ConfigService } from 'koffing/backend/services/config.service';
-import { Account } from 'koffing/backend/model/account.class';
+import { ConfigService } from './config.service';
+import { Account } from './model/account';
 
 @Injectable()
 export class AccountsService {
 
-    constructor(private http: Http,
-                private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getAccountByID(accountID: number): Observable<Account> {
         return this.http.get(`${this.config.capiUrl}/processing/accounts/${accountID}`).map(res => res.json());

src/app/backend/analytics.service.ts

@@ -4,19 +4,20 @@ import * as moment from 'moment';
 import { toString } from 'lodash';
 import { Observable } from 'rxjs/Observable';
 
-import { ConfigService } from 'koffing/backend/services/config.service';
-import { PaymentMethodStat } from 'koffing/backend/model/payment-method-stat.class';
-import { PaymentRateStat } from 'koffing/backend/model/payment-rate-stat.class';
-import { PaymentGeoStat } from 'koffing/backend/model/payment-geo-stat.class';
-import { PaymentConversionStat } from 'koffing/backend/model/payment-conversion-stat.class';
-import { PaymentRevenueStat } from 'koffing/backend/model/payment-revenue-stat.class';
+import { ConfigService } from './config.service';
+import { PaymentMethodStat } from './model/payment-method-stat';
+import { PaymentRateStat } from './model/payment-rate-stat';
+import { PaymentGeoStat } from './model/payment-geo-stat';
+import { PaymentConversionStat } from './model/payment-conversion-stat';
+import { PaymentRevenueStat } from './model/payment-revenue-stat';
 
 @Injectable()
 export class AnalyticsService {
 
-    constructor(private http: Http,
-                private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getPaymentMethodStats(shopID: number, from: Date, to: Date, splitUnit?: string, splitSize?: number, paymentMethod?: string): Observable<PaymentMethodStat[]> {
         const params = new URLSearchParams();

src/app/backend/backend.module.ts

@@ -1,15 +1,15 @@
 import { NgModule } from '@angular/core';
 
-import { CategoryService } from './services/category.service';
-import { ContractService } from './services/contract.service';
-import { ShopService } from './services/shop.service';
-import { ConfigService } from './services/config.service';
+import { CategoryService } from './category.service';
+import { ContractService } from './contract.service';
+import { ShopService } from './shop.service';
+import { ConfigService } from './config.service';
 import { WebhooksService } from './webhooks.service';
-import { AnalyticsService } from 'koffing/backend/analytics.service';
-import { LocationService } from 'koffing/backend/location.service';
-import { AccountsService } from 'koffing/backend/accounts.service';
-import { SearchService } from 'koffing/backend/search.service';
-import { InvoiceService } from 'koffing/backend/invoice.service';
+import { AnalyticsService } from './analytics.service';
+import { LocationService } from './location.service';
+import { AccountsService } from './accounts.service';
+import { SearchService } from './search.service';
+import { InvoiceService } from './invoice.service';
 
 @NgModule({
     providers: [
@@ -26,27 +26,3 @@ import { InvoiceService } from 'koffing/backend/invoice.service';
     ]
 })
 export class BackendModule { }
-
-export * from './services/category.service';
-export * from './services/config.service';
-export * from './services/contract.service';
-export * from './services/shop.service';
-export * from './webhooks.service';
-
-export * from './classes/account.class';
-export * from './classes/bank-account.class';
-export * from './classes/category.class';
-export * from './classes/contract.class';
-export * from './classes/contractor.class';
-export * from './classes/conversion.class';
-export * from './classes/legal-entity.class';
-export * from './classes/payout-tool.class';
-export * from './classes/payout-tool-params.class';
-export * from './classes/payout-tool-bank-account.class';
-export * from './classes/revenue.class';
-export * from './classes/russian-legal-entity.class';
-export * from './classes/shop.class';
-export * from './classes/shop-details.class';
-export * from './classes/shop-item.class';
-export * from './classes/shop-location.class';
-export * from './classes/shop-params.class';

src/app/backend/category.service.ts

@@ -2,13 +2,16 @@ import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 import 'rxjs/add/operator/toPromise';
 
-import { Category } from '../classes/category.class';
+import { Category } from './model/category';
 import { ConfigService } from './config.service';
 
 @Injectable()
 export class CategoryService {
 
-    constructor(private http: Http, private config: ConfigService) { }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getCategories(): Promise<Category[]> {
         return this.http.get(`${this.config.capiUrl}/processing/categories`)

src/app/backend/classes/contract-params.class.ts

@@ -1,7 +0,0 @@
-import { Contractor } from 'koffing/backend/classes/contractor.class';
-import { PayoutToolParams } from 'koffing/backend/classes/payout-tool-params.class';
-
-export class ContractParams {
-    public contractor: Contractor;
-    public payoutToolParams: PayoutToolParams;
-}

src/app/backend/classes/shop-item.class.ts

@@ -1,9 +0,0 @@
-export class ShopItem {
-    public value: string;
-    public label: string;
-
-    constructor(value: string, label: string) {
-        this.value = value;
-        this.label = label;
-    }
-}

src/app/backend/classes/shop.class.ts

@@ -1,27 +0,0 @@
-import * as _ from 'lodash';
-
-import { ShopDetails } from './shop-details.class';
-import { ShopAccount } from './account.class';
-import { ShopParams } from './shop-params.class';
-
-export class Shop {
-    public id: number;
-    public isBlocked: boolean;
-    public isSuspended: boolean;
-    public categoryID: number;
-    public contractID: number;
-    public payoutToolID: number;
-    public details: ShopDetails;
-    public account: ShopAccount;
-
-    constructor() {
-        this.details = new ShopDetails();
-        this.account = new ShopAccount();
-    }
-
-    public update(params: ShopParams) {
-        _.assign(this.details, params.details);
-        this.contractID = _.defaultTo(params.contractID, this.contractID);
-        this.payoutToolID = _.defaultTo(params.payoutToolID, this.payoutToolID);
-    }
-}

src/app/backend/contract.service.ts

@@ -1,21 +1,23 @@
 import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
+import { Observable } from 'rxjs';
 import 'rxjs/add/operator/toPromise';
 
 import { ConfigService } from './config.service';
-import { Contract } from '../classes/contract.class';
-import { PayoutTool } from '../classes/payout-tool.class';
-import { ContractParams } from 'koffing/backend/classes/contract-params.class';
-import { PayoutToolParams } from 'koffing/backend/classes/payout-tool-params.class';
-import { Observable } from 'rxjs';
+import { Contract } from './model/contract';
+import { PayoutTool } from './model/payout-tool';
+import { ContractParams } from './model/contract-params';
+import { PayoutToolParams } from './model/payout-tool-params';
 
 @Injectable()
 export class ContractService {
 
     private contractsUrl: string = `${this.config.capiUrl}/processing/contracts`;
 
-    constructor(private http: Http, private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getContracts(): Promise<Contract[]> {
         return this.http.get(this.contractsUrl)

src/app/backend/invoice.service.ts

@@ -2,7 +2,7 @@ import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 
-import { ConfigService } from './services/config.service';
+import { ConfigService } from './config.service';
 import { CreateInvoiceParams } from './requests/create-invoice-request';
 import { Invoice } from './model/invoice';
 import { InvoiceAccessToken } from './model/invoice-access-token';

src/app/backend/location.service.ts

@@ -4,15 +4,16 @@ import { Observable } from 'rxjs/Observable';
 import { Observer } from 'rxjs/Observer';
 import { isNil } from 'lodash';
 
-import { ConfigService } from 'koffing/backend/services/config.service';
-import { LocationName } from 'koffing/backend/model/location-name.class';
+import { ConfigService } from './config.service';
+import { LocationName } from './model/location-name';
 
 @Injectable()
 export class LocationService {
 
-    constructor(private http: Http,
-                private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getLocationsNames(geoIDs: string[], language?: string): Observable<LocationName[]> {
         if (isNil(geoIDs) || geoIDs.length === 0) {

src/app/backend/model/contract-params.ts

@@ -0,0 +1,12 @@
+import { Contractor } from './contractor';
+import { PayoutToolParams } from './payout-tool-params';
+
+export class ContractParams {
+    public contractor: Contractor;
+    public payoutToolParams: PayoutToolParams;
+
+    constructor() {
+        this.contractor = new Contractor();
+        this.payoutToolParams = new PayoutToolParams();
+    }
+}

src/app/backend/model/contract.ts

@@ -1,8 +1,9 @@
-import { Contractor } from './contractor.class';
+import { Contractor } from './contractor';
 
 export class Contract {
     public id: number;
     public contractor: Contractor;
+    public status: string;
     public validSince: string;
     public validUntil: string;
     public terminatedAt: string;

src/app/backend/model/contractor.ts

@@ -1,5 +1,5 @@
-import { BankAccount } from './bank-account.class';
-import { LegalEntity } from './legal-entity.class';
+import { BankAccount } from './bank-account';
+import { LegalEntity } from './legal-entity';
 
 export class Contractor {
     public bankAccount: BankAccount;

src/app/backend/model/invoice-search-result.ts

@@ -1,4 +1,4 @@
-import { Invoice } from 'koffing/backend/model/invoice';
+import { Invoice } from './invoice';
 
 export class InvoiceSearchResult {
     public totalCount: number;

src/app/backend/model/invoice.ts

@@ -1,6 +1,4 @@
 export class Invoice {
-    public status: string;
-    public reason: string;
     public id: string;
     public shopID: number;
     public createdAt: string;
@@ -10,4 +8,6 @@ export class Invoice {
     public metadata: object;
     public product: string;
     public description: string;
+    public status: string;
+    public reason: string;
 }

src/app/backend/model/payment-search-result.ts

@@ -1,4 +1,4 @@
-import { Payment } from 'koffing/backend/model/payment';
+import { Payment } from './payment';
 
 export class PaymentSearchResult {
     public totalCount: number;

src/app/backend/model/payment.ts

@@ -1,18 +1,18 @@
-import { LogicError } from 'koffing/backend/model/logic-error';
-import { ContactInfo } from 'koffing/backend/model/contact-info';
+import { LogicError } from './logic-error';
+import { ContactInfo } from './contact-info';
 
 export class Payment {
     public id: string;
-    public status: string;
-    public error: LogicError;
     public invoiceID: string;
     public createdAt: string;
-    public paymentToolToken: string;
-    public paymentSession: string;
-    public contactInfo: ContactInfo;
     public amount: number;
-    public fee: number;
     public currency: string;
+    public contactInfo: ContactInfo;
+    public paymentSession: string;
+    public paymentToolToken: string;
+    public fee: number;
     public fingerprint: string;
     public payerIP: string;
+    public status: string;
+    public error: LogicError;
 }

src/app/backend/model/payout-tool-bank-account.ts

@@ -1,5 +1,5 @@
-import { PayoutToolParams } from './payout-tool-params.class';
-import { BankAccount } from './bank-account.class';
+import { PayoutToolParams } from './payout-tool-params';
+import { BankAccount } from './bank-account';
 
 export class PayoutToolBankAccount extends PayoutToolParams {
     public bankAccount: BankAccount;

src/app/backend/model/payout-tool.ts

@@ -1,4 +1,4 @@
-import { PayoutToolParams } from './payout-tool-params.class';
+import { PayoutToolParams } from './payout-tool-params';
 
 export class PayoutTool {
     public id: number;

src/app/backend/model/russian-legal-entity.ts

@@ -1,4 +1,4 @@
-import { LegalEntity } from './legal-entity.class';
+import { LegalEntity } from './legal-entity';
 
 export class RussianLegalEntity extends LegalEntity {
     public registeredName: string;

src/app/backend/model/shop-details.ts

@@ -1,7 +1,11 @@
-import { ShopLocation } from './shop-location.class';
+import { ShopLocation } from './shop-location';
 
 export class ShopDetails {
     public name: string;
     public description: string;
     public location: ShopLocation;
+
+    constructor() {
+        this.location = new ShopLocation();
+    }
 }

src/app/backend/model/shop-location-url.ts

@@ -1,4 +1,4 @@
-import { ShopLocation } from 'koffing/backend/classes/shop-location.class';
+import { ShopLocation } from './shop-location';
 
 export class ShopLocationUrl extends ShopLocation {
 

src/app/backend/model/shop.ts

@@ -0,0 +1,28 @@
+import { assign, defaultTo } from 'lodash';
+
+import { ShopDetails } from './shop-details';
+import { ShopAccount } from './shop-account';
+import { ShopParams } from '../requests/shop-request';
+
+export class Shop {
+    public id: number;
+    public isBlocked: boolean;
+    public isSuspended: boolean;
+    public categoryID: number;
+    public contractID: number;
+    public payoutToolID: number;
+    public details: ShopDetails;
+    public account: ShopAccount;
+
+    constructor() {
+        this.details = new ShopDetails();
+        this.account = new ShopAccount();
+    }
+
+    // TODO: избавиться от этого метода
+    public update(params: ShopParams) {
+        assign(this.details, params.details);
+        this.contractID = defaultTo(params.contractID, this.contractID);
+        this.payoutToolID = defaultTo(params.payoutToolID, this.payoutToolID);
+    }
+}

src/app/backend/model/webhook.ts

@@ -1,4 +1,4 @@
-import { WebhookScope } from './webhook-scope.class';
+import { WebhookScope } from './webhook-scope';
 
 export class Webhook {
     public id: string;

src/app/backend/queries/create-webhook.ts

@@ -1,6 +0,0 @@
-import { WebhookScope } from '../model/webhook-scope.class';
-
-export class CreateWebhook {
-    public url: string;
-    public scope: WebhookScope;
-}

src/app/backend/requests/create-webhook-request.ts

@@ -0,0 +1,6 @@
+import { WebhookScope } from '../model/webhook-scope';
+
+export class CreateWebhookParams {
+    public url: string;
+    public scope: WebhookScope;
+}

src/app/backend/requests/shop-request.ts

@@ -1,4 +1,4 @@
-import { ShopDetails } from 'koffing/backend/backend.module';
+import { ShopDetails } from '../model/shop-details';
 import * as _ from 'lodash';
 
 export class ShopParams {

src/app/backend/search.service.ts

@@ -4,18 +4,19 @@ import { Observable } from 'rxjs/Observable';
 import * as moment from 'moment';
 import { toString, forEach, isNumber, isDate } from 'lodash';
 
-import { InvoiceSearchResult } from 'koffing/backend/model/invoice-search-result';
-import { ConfigService } from 'koffing/backend/services/config.service';
-import { PaymentSearchResult } from 'koffing/backend/model/payment-search-result';
-import { SearchInvoicesParams } from 'koffing/backend/requests/search-invoices-request';
-import { SearchPaymentsParams } from 'koffing/backend/requests/search-payments-request';
+import { ConfigService } from './config.service';
+import { InvoiceSearchResult } from './model/invoice-search-result';
+import { PaymentSearchResult } from './model/payment-search-result';
+import { SearchInvoicesParams } from './requests/search-invoices-request';
+import { SearchPaymentsParams } from './requests/search-payments-request';
 
 @Injectable()
 export class SearchService {
 
-    constructor(private http: Http,
-                private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public searchInvoices(shopID: string, invoiceParams: SearchInvoicesParams): Observable<InvoiceSearchResult> {
         const params = this.toSearchParams(invoiceParams);

src/app/backend/shop.service.ts

@@ -2,9 +2,9 @@ import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 import 'rxjs/add/operator/toPromise';
 
-import { Shop } from '../classes/shop.class';
+import { Shop } from './model/shop';
 import { ConfigService } from './config.service';
-import { ShopParams } from 'koffing/backend/classes/shop-params.class';
+import { ShopParams } from './requests/shop-request';
 import { Observable } from 'rxjs';
 
 @Injectable()
@@ -12,7 +12,10 @@ export class ShopService {
 
     private shopsUrl: string = `${this.config.capiUrl}/processing/shops`;
 
-    constructor(private http: Http, private config: ConfigService) {}
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
     public getShops(): Promise<Shop[]> {
         return this.http.get(this.shopsUrl)

src/app/backend/webhooks.service.ts

@@ -2,18 +2,19 @@ import { Injectable } from '@angular/core';
 import { Http } from '@angular/http';
 import { Observable } from 'rxjs/Observable';
 
-import { ConfigService } from 'koffing/backend/services/config.service';
-import { Webhook } from 'koffing/backend/model/webhook.class';
-import { CreateWebhook } from 'koffing/backend/queries/create-webhook';
+import { ConfigService } from './config.service';
+import { Webhook } from './model/webhook';
+import { CreateWebhookParams } from './requests/create-webhook-request';
 
 @Injectable()
 export class WebhooksService {
 
-    constructor(private http: Http,
-                private config: ConfigService) {
-    }
+    constructor(
+        private http: Http,
+        private config: ConfigService
+    ) { }
 
-    public createWebhook(webhook: CreateWebhook): Observable<Webhook> {
+    public createWebhook(webhook: CreateWebhookParams): Observable<Webhook> {
         return this.http.post(`${this.config.capiUrl}/processing/webhooks`, webhook).map(res => res.json());
     }
 

src/app/common/common.module.ts

@@ -2,10 +2,10 @@ import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
 import { FormsModule } from '@angular/forms';
 
-import { SelectComponent } from './components/select/select.component';
-import { LoadingComponent } from './components/loading/loading.component';
-import { MinValueValidatorDirective } from 'koffing/common/min-value.directive';
-import { MaxValueValidatorDirective } from 'koffing/common/max-value.directive';
+import { SelectComponent } from './select/select.component';
+import { LoadingComponent } from './loading/loading.component';
+import { MinValueValidatorDirective } from './min-value.directive';
+import { MaxValueValidatorDirective } from './max-value.directive';
 
 @NgModule({
     imports: [
@@ -26,7 +26,3 @@ import { MaxValueValidatorDirective } from 'koffing/common/max-value.directive';
     ]
 })
 export class CommonModule { }
-
-export * from './components/loading/loading.component';
-export * from './components/select/select.component';
-export * from './components/select/select.class';

src/app/common/select/select.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, Output, EventEmitter } from '@angular/core';
 import { NG_VALUE_ACCESSOR } from '@angular/forms';
 
-import { SelectItem } from './select.class';
+import { SelectItem } from './select-item';
 
 @Component({
     selector: 'kof-select',

src/app/management/claims/claims-edit/claim-data.class.ts

@@ -1,14 +0,0 @@
-import { PayoutToolParams } from 'koffing/backend/classes/payout-tool-params.class';
-import { Contractor } from 'koffing/backend/classes/contractor.class';
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { ShopEditingParams } from './shop-editing-params.class';
-
-export class ClaimData {
-
-    public claimID: number;
-    public payoutToolParams: PayoutToolParams;
-    public payoutToolContractId: number;
-    public contractor: Contractor;
-    public shop: Shop;
-    public shopEditingParams: ShopEditingParams;
-}

src/app/management/claims/claims-edit/claim-data.service.ts

@@ -1,14 +1,14 @@
 import { Injectable } from '@angular/core';
 import * as _ from 'lodash';
 
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { ShopService } from 'koffing/backend/services/shop.service';
-import { ClaimData } from './claim-data.class';
-import { ShopEditingParams } from './shop-editing-params.class';
-import { ContractCreation } from './classes/contract-creation.class';
-import { ContractPayoutToolCreation } from './classes/contract-payout-tool-creation.class';
-import { ShopCreation } from './classes/shop-creation.class';
-import { ShopUpdate } from './classes/shop-update.class';
+import { Shop } from 'koffing/backend/model/shop';
+import { ShopService } from 'koffing/backend/shop.service';
+import { ClaimData } from './claim-data';
+import { ShopEditingParams } from './shop-editing-params';
+import { ContractCreation } from './classes/contract-creation';
+import { ContractPayoutToolCreation } from './classes/contract-payout-tool-creation';
+import { ShopCreation } from './classes/shop-creation';
+import { ShopUpdate } from './classes/shop-update';
 
 @Injectable()
 export class ClaimDataService {

src/app/management/claims/claims-edit/claim-data.ts

@@ -0,0 +1,14 @@
+import { PayoutToolParams } from 'koffing/backend/model/payout-tool-params';
+import { Contractor } from 'koffing/backend/model/contractor';
+import { Shop } from 'koffing/backend/model/shop';
+import { ShopEditingParams } from './shop-editing-params';
+
+export class ClaimData {
+
+    public claimID: number;
+    public payoutToolParams: PayoutToolParams;
+    public payoutToolContractId: number;
+    public contractor: Contractor;
+    public shop: Shop;
+    public shopEditingParams: ShopEditingParams;
+}

src/app/management/claims/claims-edit/claims-edit.component.ts

@@ -2,12 +2,12 @@ import { Component, OnInit, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 import * as _ from 'lodash';
 
-import { ContractorTransfer } from '../../shops/create-shop-wizard/selection-contract/create-contract/contractor-transfer.class';
-import { PaytoolTransfer } from '../../shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer.class';
-import { ShopDetailTransfer } from '../../shops/create-shop-wizard/selection-shop-fields/add-shop/shop-detail-transfer.class';
-import { ShopEditingTransfer } from '../../shops/shop-editing/edit-shop/shop-editing-transfer.class';
+import { ContractorTransfer } from '../../shops/create-shop-wizard/selection-contract/create-contract/contractor-transfer';
+import { PaytoolTransfer } from '../../shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer';
+import { ShopDetailTransfer } from '../../shops/create-shop-wizard/selection-shop-fields/add-shop/shop-detail-transfer';
+import { ShopEditingTransfer } from '../../shops/shop-editing/edit-shop/shop-editing-transfer';
 import { CreatePayoutToolComponent } from '../../shops/create-shop-wizard/selection-paytool/create-paytool/create-paytool.component';
-import { ClaimData } from './claim-data.class';
+import { ClaimData } from './claim-data';
 import { ClaimDataService } from './claim-data.service';
 import { ClaimsEditService } from './claims-edit.service';
 

src/app/management/claims/claims-edit/claims-edit.service.ts

@@ -1,22 +1,22 @@
 import { Injectable } from '@angular/core';
 
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { Contractor } from 'koffing/backend/classes/contractor.class';
-import { ShopService } from 'koffing/backend/services/shop.service';
-import { ShopParams } from 'koffing/backend/classes/shop-params.class';
-import { PayoutToolParams } from 'koffing/backend/classes/payout-tool-params.class';
-import { PaytoolDecision } from 'koffing/management/shops/create-shop-wizard/selection-paytool/paytool-decision.class';
+import { Shop } from 'koffing/backend/model/shop';
+import { Contractor } from 'koffing/backend/model/contractor';
+import { ShopService } from 'koffing/backend/shop.service';
+import { ShopParams } from 'koffing/backend/requests/shop-request';
+import { PayoutToolParams } from 'koffing/backend/model/payout-tool-params';
+import { PaytoolDecision } from 'koffing/management/shops/create-shop-wizard/selection-paytool/paytool-decision';
 import { PaytoolDecisionService } from 'koffing/management/shops/create-shop-wizard/selection-paytool/paytool-decision.service';
 import { ClaimDataService } from './claim-data.service';
-import { ClaimData } from './claim-data.class';
-import { Claim } from '../../shared/claim.class';
+import { ClaimData } from './claim-data';
+import { Claim } from '../../shared/claim';
 import { ClaimService } from '../../shared/claim.service';
-import { ContractCreation } from './classes/contract-creation.class';
-import { ContractModification } from './classes/contract-modification.class';
-import { ContractPayoutToolCreation } from './classes/contract-payout-tool-creation.class';
-import { ShopCreation } from './classes/shop-creation.class';
-import { ShopModification } from './classes/shop-modification.class';
-import { ShopUpdate } from './classes/shop-update.class';
+import { ContractCreation } from './classes/contract-creation';
+import { ContractModification } from './classes/contract-modification';
+import { ContractPayoutToolCreation } from './classes/contract-payout-tool-creation';
+import { ShopCreation } from './classes/shop-creation';
+import { ShopModification } from './classes/shop-modification';
+import { ShopUpdate } from './classes/shop-update';
 
 @Injectable()
 export class ClaimsEditService {

src/app/management/claims/claims-edit/classes/contract-creation.ts

@@ -1,5 +1,5 @@
-import { PartyModification } from '../../../shared/party-modification.class';
-import { Contract } from 'koffing/backend/classes/contract.class';
+import { PartyModification } from '../../../shared/party-modification';
+import { Contract } from 'koffing/backend/model/contract';
 
 export class ContractCreation extends PartyModification {
 

src/app/management/claims/claims-edit/classes/contract-modification.ts

@@ -1,4 +1,4 @@
-import { PartyModification } from '../../../shared/party-modification.class';
+import { PartyModification } from '../../../shared/party-modification';
 
 export class ContractModification extends PartyModification {
 

src/app/management/claims/claims-edit/classes/contract-payout-tool-creation.class.ts

@@ -1,7 +0,0 @@
-import { ContractModification } from './contract-modification.class';
-import { PayoutTool } from 'koffing/backend/classes/payout-tool.class';
-
-export class ContractPayoutToolCreation extends ContractModification {
-
-    public payoutTool: PayoutTool;
-}

src/app/management/claims/claims-edit/classes/contract-payout-tool-creation.ts

@@ -0,0 +1,7 @@
+import { ContractModification } from './contract-modification';
+import { PayoutTool } from 'koffing/backend/model/payout-tool';
+
+export class ContractPayoutToolCreation extends ContractModification {
+
+    public payoutTool: PayoutTool;
+}

src/app/management/claims/claims-edit/classes/shop-account-creation.class.ts

@@ -1,7 +0,0 @@
-import { ShopModification } from './shop-modification.class';
-import { ShopAccount } from 'koffing/backend/classes/account.class';
-
-export class ShopAccountCreation extends ShopModification {
-
-    public account: ShopAccount;
-}

src/app/management/claims/claims-edit/classes/shop-account-creation.ts

@@ -0,0 +1,7 @@
+import { ShopModification } from './shop-modification';
+import { ShopAccount } from 'koffing/backend/model/shop-account';
+
+export class ShopAccountCreation extends ShopModification {
+
+    public account: ShopAccount;
+}

src/app/management/claims/claims-edit/classes/shop-creation.ts

@@ -1,5 +1,5 @@
-import { PartyModification } from '../../../shared/party-modification.class';
-import { Shop } from 'koffing/backend/classes/shop.class';
+import { PartyModification } from '../../../shared/party-modification';
+import { Shop } from 'koffing/backend/model/shop';
 
 export class ShopCreation extends PartyModification {
 

src/app/management/claims/claims-edit/classes/shop-modification.ts

@@ -1,4 +1,4 @@
-import { PartyModification } from '../../../shared/party-modification.class';
+import { PartyModification } from '../../../shared/party-modification';
 
 export class ShopModification extends PartyModification {
 

src/app/management/claims/claims-edit/classes/shop-update.class.ts

@@ -1,7 +0,0 @@
-import { ShopModification } from './shop-modification.class';
-import { ShopParams } from 'koffing/backend/classes/shop-params.class';
-
-export class ShopUpdate extends ShopModification {
-
-    public details: ShopParams;
-}

src/app/management/claims/claims-edit/classes/shop-update.ts

@@ -0,0 +1,7 @@
+import { ShopModification } from './shop-modification';
+import { ShopParams } from 'koffing/backend/requests/shop-request';
+
+export class ShopUpdate extends ShopModification {
+
+    public details: ShopParams;
+}

src/app/management/claims/claims-edit/shop-editing-params.ts

@@ -1,5 +1,5 @@
-import { Shop } from 'koffing/backend/classes/shop.class';
-import { ShopParams } from 'koffing/backend/classes/shop-params.class';
+import { Shop } from 'koffing/backend/model/shop';
+import { ShopParams } from 'koffing/backend/requests/shop-request';
 
 export class ShopEditingParams {
     public shop: Shop;

src/app/management/claims/claims.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit } from '@angular/core';
 
 import { ClaimReceiveBroadcaster } from 'koffing/broadcaster/services/claim-receive.broadcaster.service';
 import { ClaimRevokeBroadcaster } from 'koffing/broadcaster/services/claim-revoke-broadcaster.service';
-import { Claim } from '../shared/claim.class';
+import { Claim } from '../shared/claim';
 import { ClaimService } from '../shared/claim.service';
 
 @Component({

src/app/management/claims/contract-creation/contract-creation.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { Contract } from 'koffing/backend/classes/contract.class';
+import { Contract } from 'koffing/backend/model/contract';
 
 @Component({
     selector: 'kof-contract-creation',

src/app/management/claims/payout-tool-creation/payout-tool-creation.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { PayoutTool } from 'koffing/backend/classes/payout-tool.class';
+import { PayoutTool } from 'koffing/backend/model/payout-tool';
 
 @Component({
     selector: 'kof-payout-tool-creation',

src/app/management/claims/shop-modification/shop-modification.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { Shop } from 'koffing/backend/classes/shop.class';
+import { Shop } from 'koffing/backend/model/shop';
 
 @Component({
     selector: 'kof-shop-modification',

src/app/management/contracts/contract-create/contract-create.component.ts

@@ -1,15 +1,15 @@
 import { Component, ViewChild } from '@angular/core';
 import { Router } from '@angular/router';
 
-import { ContractService } from 'koffing/backend/services/contract.service';
-import { Contractor } from 'koffing/backend/classes/contractor.class';
-import { PayoutToolBankAccount } from 'koffing/backend/classes/payout-tool-bank-account.class';
-import { ContractParams } from 'koffing/backend/classes/contract-params.class';
+import { ContractService } from 'koffing/backend/contract.service';
+import { Contractor } from 'koffing/backend/model/contractor';
+import { PayoutToolBankAccount } from 'koffing/backend/model/payout-tool-bank-account';
+import { ContractParams } from 'koffing/backend/model/contract-params';
 import { ClaimReceiveBroadcaster } from 'koffing/broadcaster/services/claim-receive.broadcaster.service';
 import { ClaimCreateBroadcaster } from 'koffing/broadcaster/services/claim-create.broadcaster.service';
-import { ContractorTransfer } from 'koffing/management/shops/create-shop-wizard/selection-contract/create-contract/contractor-transfer.class';
-import { PaytoolTransfer } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer.class';
-import { BankAccount } from 'koffing/backend/classes/bank-account.class';
+import { ContractorTransfer } from 'koffing/management/shops/create-shop-wizard/selection-contract/create-contract/contractor-transfer';
+import { PaytoolTransfer } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer';
+import { BankAccount } from 'koffing/backend/model/bank-account';
 import { CreatePayoutToolComponent } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/create-paytool.component';
 import { CreateContractComponent } from 'koffing/management/shops/create-shop-wizard/selection-contract/create-contract/create-contract.component';
 

src/app/management/contracts/contract-view/contract-view.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { Contract } from 'koffing/backend/classes/contract.class';
+import { Contract } from 'koffing/backend/model/contract';
 
 @Component({
     selector: 'kof-contract-view',

src/app/management/contracts/contracts.component.ts

@@ -1,9 +1,9 @@
 import { Component, OnInit } from '@angular/core';
 
-import { ContractService } from 'koffing/backend/services/contract.service';
-import { Contract } from 'koffing/backend/classes/contract.class';
+import { ContractService } from 'koffing/backend/contract.service';
+import { Contract } from 'koffing/backend/model/contract';
 import { ClaimRevokeBroadcaster } from 'koffing/broadcaster/services/claim-revoke-broadcaster.service';
-import { Claim } from '../shared/claim.class';
+import { Claim } from '../shared/claim';
 import { ClaimService } from '../shared/claim.service';
 
 @Component({

src/app/management/contracts/payout-tool-create/payout-tool-create.component.ts

@@ -1,11 +1,11 @@
 import { Component, ViewChild } from '@angular/core';
 import { Router, ActivatedRoute } from '@angular/router';
 
-import { ContractService } from 'koffing/backend/services/contract.service';
-import { PayoutToolBankAccount } from 'koffing/backend/classes/payout-tool-bank-account.class';
+import { ContractService } from 'koffing/backend/contract.service';
+import { PayoutToolBankAccount } from 'koffing/backend/model/payout-tool-bank-account';
 import { ClaimReceiveBroadcaster } from 'koffing/broadcaster/services/claim-receive.broadcaster.service';
 import { ClaimCreateBroadcaster } from 'koffing/broadcaster/services/claim-create.broadcaster.service';
-import { PaytoolTransfer } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer.class';
+import { PaytoolTransfer } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/paytool-transfer';
 import { CreatePayoutToolComponent } from 'koffing/management/shops/create-shop-wizard/selection-paytool/create-paytool/create-paytool.component';
 
 @Component({

src/app/management/contracts/payout-tool-view/payout-tool-view.component.ts

@@ -1,6 +1,6 @@
 import { Component, Input } from '@angular/core';
 
-import { PayoutTool } from 'koffing/backend/classes/payout-tool.class';
+import { PayoutTool } from 'koffing/backend/model/payout-tool';
 
 @Component({
     selector: 'kof-payout-tool-view',

src/app/management/contracts/payout-tools/payout-tools.component.ts

@@ -1,7 +1,7 @@
 import { Component, Input, OnInit } from '@angular/core';
 
-import { ContractService } from 'koffing/backend/services/contract.service';
-import { PayoutTool } from 'koffing/backend/classes/payout-tool.class';
+import { ContractService } from 'koffing/backend/contract.service';
+import { PayoutTool } from 'koffing/backend/model/payout-tool';
 
 @Component({
     selector: 'kof-payout-tools',