Merge pull request #28 from GuoXiCheng/dev-c

update

src/__tests__/helper/user-model.ts

@@ -0,0 +1,6 @@
+import { TinyModel } from "../../storage-lib/interfaces";
+
+export class UserModel extends TinyModel {
+    name: string;
+    age: number;
+}

src/__tests__/helper/user-storage.ts

@@ -1,7 +1,9 @@
 import { StartTest } from './start-test';
 import { GiteeStorage } from '../../storage-lib/gitee-storage';
+import { UserModel } from './user-model';
 
-export class UserStorage extends GiteeStorage {
+export class UserStorage extends GiteeStorage<UserModel> {
+    issueNumber = "I8H4X2";
     constructor() {
         super(new StartTest().getRequest());
     }

src/__tests__/storage-lib.test.ts → src/__tests__/user-storage.test.ts

@@ -2,6 +2,6 @@ import { UserStorage } from "./helper/user-storage";
 
 test('Test Storage Lib', async () => {
     const userStorage = new UserStorage();
-    const detail: any[] = await userStorage.findAll();
+    const detail = await userStorage.findAll();
     expect(detail.length).toBeGreaterThan(0);
 }, 30000);

src/request-lib/axios-request.ts

@@ -4,14 +4,19 @@ import { TinyRequest } from './interfaces';
 export class AxiosRequest implements TinyRequest {
     constructor(private axios: AxiosInstance, private accessToken: string) { }
 
-    async get(url: string) {
-        const result = await this.axios.get(url, {
-            headers: {
-                'Authorization': this.accessToken,
-                'PRIVATE-TOKEN': this.accessToken
-            }
+    async get<T>(url: string): Promise<T> {
+        return new Promise((resolve, reject) => {
+            this.axios.get(url, {
+                headers: {
+                    'Authorization': this.accessToken,
+                    'PRIVATE-TOKEN': this.accessToken
+                }
+            }).then((res) => {
+                resolve(res.data as T);
+            }).catch(error => {
+                reject(error);
+            });
         });
-        return result.data;
     }
 
     post(url: string) {

src/request-lib/interfaces.ts

@@ -12,7 +12,7 @@ export interface WxRequestOptions {
 }
 
 export interface TinyRequest {
-    get(url: string): Promise<any>;
+    get<T>(url: string): Promise<T>;
     post(url: string): void;
 };
 

src/request-lib/wx-request.ts

@@ -3,7 +3,7 @@ import { WxInstance, TinyRequest } from './interfaces';
 export class WxRequest implements TinyRequest {
     constructor(private wx: WxInstance, private accessToken: string) { }
 
-    async get(url: string) {
+    async get<T>(url: string): Promise<T> {
         return new Promise((resolve, reject) => {
             this.wx.request({
                 url,
@@ -13,7 +13,7 @@ export class WxRequest implements TinyRequest {
                     'PRIVATE-TOKEN': this.accessToken
                 },
                 success: (res: {data: string | Object | ArrayBuffer, statusCode: number}) => {
-                    resolve(res);
+                    resolve(res as T);
                 },
                 fail: (errMsg: string, errNo: number) => {
                     reject(errMsg);

src/storage-lib/gitee-storage.ts

@@ -1,17 +1,32 @@
 import { TinyRequest } from "../request-lib/interfaces";
-import { TinyStorage } from "./interfaces";
+import { TinyModel, TinyStorage } from "./interfaces";
 
-export class GiteeStorage implements TinyStorage {
+export interface GiteeResponse {
+    id: number;
+    body: string;
+    user: object;
+    created_at: string;
+    updated_at: string;
+}
+
+export abstract class GiteeStorage<T> implements TinyStorage<T> {
     protected baseUrl = "https://gitee.com";
+    protected issueNumber!: string;
     constructor(private requestInstance: TinyRequest) { }
 
     async findOne(): Promise<void> {
         this.requestInstance.get("");
     }
 
-    async findAll(): Promise<any> {
-        const url = `${this.baseUrl}/api/v5/repos/guoxicheng/tiny-crud/issues/I8H4X2/comments`;
-        return this.requestInstance.get(url);
+    async findAll(): Promise<T[]> {
+        const url = `${this.baseUrl}/api/v5/repos/guoxicheng/tiny-crud/issues/${this.issueNumber}/comments`;
+        const response = await this.requestInstance.get<GiteeResponse[]>(url);
+        return response.map(item => ({
+            id: item.id,
+            ...JSON.parse(item.body),
+            created_at: item.created_at,
+            updated_at: item.updated_at
+        })) as T[];
     }
 
 }

src/storage-lib/interfaces.ts

@@ -1,4 +1,10 @@
-export interface TinyStorage {
+export interface TinyStorage<T> {
     findOne(): void;
-    findAll(): void;
+    findAll(): Promise<T[]>;
+}
+
+export class TinyModel {
+    id!: number;
+    created_at!: string;
+    updated_at!: string;
 }