Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feat: ghost type을 서버(hatchout)와 일치시키고, 서버 api를 호출하도록 함(#39, #40) #41

Merged
merged 3 commits into from
Mar 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 36 additions & 0 deletions src/api/ghost/ghost.api.spec.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
import MockAdapter from 'axios-mock-adapter';
import axios from 'axios';
import {instance, mock, when} from 'ts-mockito';
import {AxiosSupplier} from '@/api/axios/axios.supplier';
import {HttpClient} from '@/api/axios/http.client';
import {GhostApi} from '@/api/ghost/ghost.api';
import {Ghost} from '@/types';

describe('GhostApi', () => {
const mockAdapter = new MockAdapter(axios);
const mockAxiosSupplier = mock(AxiosSupplier);
when(mockAxiosSupplier.get()).thenReturn(axios.create());

const httpClient = new HttpClient(instance(mockAxiosSupplier));
const ghostApi = new GhostApi(httpClient);
let responseData: Ghost;
const domain = 'ghosts';
describe('getByPage()', () => {
const page = 1;
it('should return ghosts', async () => {
responseData = {
name: 'Token Name1',
gene: 'token ID',
tokenId: 1,
userAddress: 'user1',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
};
mockAdapter.onGet(`/${domain}?page=${page}`).reply(200, responseData);

expect(await ghostApi.getByPage(page)).toEqual(responseData);
});
});
});
14 changes: 14 additions & 0 deletions src/api/ghost/ghost.api.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
import {Service} from 'typedi';
import {HttpClient} from '@/api/axios/http.client';
import {Ghost} from '@/types';

@Service()
export class GhostApi {
private domain = 'ghosts';

constructor(private httpClient: HttpClient) {}

public async getByPage(page: number): Promise<Ghost[]> {
return await this. httpClient.call<Ghost[]>('GET', `${this.domain}?page=${page}`);
}
}
2 changes: 1 addition & 1 deletion src/api/user/user.api.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import {UserApi} from '@/api/user/user.api';
import {AxiosSupplier} from '@/api/axios/axios.supplier';
import {HttpClient} from '@/api/axios/http.client';

describe('UserApi', () => {
describe('UserApi', () => {

const mockAdapter = new MockAdapter(axios);
const mockAxiosSupplier = mock(AxiosSupplier);
Expand Down
4 changes: 4 additions & 0 deletions src/components/sections/MarketPlaceSection.vue
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@ import GhostTable from '@/components/tables/GhostTable.vue';
import {Inject} from "vue-typedi";
import tokens from "@/store/tokens";
import {UserModule} from "@/store/modules/user";
import {GhostModule} from "@/store/modules/ghost";

@Component({
components: { GhostCard, GhostTable},
Expand All @@ -40,6 +41,9 @@ export default class MarketPlaceSection extends Vue {
@Inject(tokens.USER_MODULE)
public userModule!: UserModule;

@Inject(tokens.GHOST_MODULE)
public ghostModule!: GhostModule;

constructor() {
super();
this.currentNum = 1;
Expand Down
8 changes: 7 additions & 1 deletion src/store/index.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import Vue from 'vue';
import Vuex from 'vuex';

import { createVuexStore } from 'vuex-simple';
import {createVuexStore} from 'vuex-simple';
import {Store} from './store';
import {Container} from 'vue-typedi';
import tokens from './tokens';
Expand All @@ -12,6 +12,7 @@ Vue.use(Vuex);
const instance = new Store();

Container.set(tokens.USER_MODULE, instance.userModule);
Container.set(tokens.GHOST_MODULE, instance.ghostModule);

export const store = createVuexStore(instance, {
strict: false,
Expand All @@ -20,3 +21,8 @@ export const store = createVuexStore(instance, {

});

// todo: move to config
const initPage: number = 1;
// todo: handle error correctly
instance.ghostModule.loadGhostsByPage(initPage).then().catch();

82 changes: 75 additions & 7 deletions src/store/modules/ghost.ts
Original file line number Diff line number Diff line change
@@ -1,21 +1,89 @@
import {Getter, State} from 'vuex-simple';
import {Action, Getter, State} from 'vuex-simple';
import {Ghost} from '@/types';
import {Inject} from 'typedi';
import {GhostApi} from '@/api/ghost/ghost.api';
import {Injectable} from 'vue-typedi';

@Injectable()
export class GhostModule {

@Inject()
private ghostApi!: GhostApi;

@State()
private ghosts!: Ghost[];

constructor() {
this.ghosts = [
{gene: 'token ID', evilPoint: 90, angelPoint: 80, name: 'Token Name1', level: 2},
{gene: 'token ID2', evilPoint: 90, angelPoint: 80, name: 'Token Name2', level: 2},
{gene: 'token ID3', evilPoint: 90, angelPoint: 80, name: 'Token Name3', level: 2},
{gene: 'token ID4', evilPoint: 90, angelPoint: 80, name: 'Token Name4', level: 2},
{gene: 'token ID5', evilPoint: 90, angelPoint: 80, name: 'Token Name5', level: 2},
{gene: 'token ID6', evilPoint: 90, angelPoint: 80, name: 'Token Name6', level: 2},
{
name: 'Token Name1',
gene: 'token ID',
tokenId: 1,
userAddress: 'user1',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
{
name: 'Token Name2',
gene: 'token ID2',
tokenId: 2,
userAddress: 'user2',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
{
name: 'Token Name3',
gene: 'token ID3',
tokenId: 3,
userAddress: 'user3',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
{
name: 'Token Name4',
gene: 'token ID4',
tokenId: 4,
userAddress: 'user4',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
{
name: 'Token Name5',
gene: 'token ID5',
tokenId: 5,
userAddress: 'user5',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
{
name: 'Token Name6',
gene: 'token ID6',
tokenId: 6,
userAddress: 'user6',
level: 1,
angelPoint: 10,
devilPoint: 20,
createdDate: Date.now(),
},
];
}


@Action()
public async loadGhostsByPage(page: number): Promise<void> {
this.ghosts = await this.ghostApi.getByPage(page);
}

@Getter()
public get getGhosts(): Ghost[] {
return this.ghosts;
Expand Down
1 change: 1 addition & 0 deletions src/store/tokens.ts
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,5 @@ import {Token} from 'typedi';

export default {
USER_MODULE: new Token(),
GHOST_MODULE: new Token(),
};
7 changes: 5 additions & 2 deletions src/types/ghost.ts
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
export interface Ghost {
readonly name: string;
readonly gene: string;
readonly evilPoint: number;
readonly angelPoint: number;
readonly tokenId: number;
readonly userAddress: string;
readonly level: number;
readonly angelPoint: number;
readonly devilPoint: number;
readonly createdDate: number;
}