=> {
+ const result: T | string = await Promise.race([
action,
timeout(TIME_OUT_SEC),
]);
@@ -56,7 +57,7 @@ export const timeOutConnect = async (
return result;
};
-export const renderRequiredText = (field: string, element: Element) => {
+export const renderRequiredText = (field: string, element: Element): void => {
const markup: string = `
${MESSAGE.REQUIRED_MESSAGE(field)}
`;
@@ -64,6 +65,21 @@ export const renderRequiredText = (field: string, element: Element) => {
element.insertAdjacentHTML('afterend', markup);
};
-export const redirectToLoginPage = () => {
+export const redirectToLoginPage = (): void => {
window.location.replace('/login');
};
+
+export const convertDataObjectToModel = (dataObj: {
+ id: string;
+ data: object;
+}): dataObj => {
+ const { id } = dataObj;
+
+ return { id, ...dataObj.data } as dataObj;
+};
+
+export const convertModelToDataObject = (model: T): T => {
+ const { id, ...data } = model;
+
+ return { id, data } as T;
+};
diff --git a/typescript-practice/src/ts/helpers/interface.ts b/typescript-practice/src/ts/helpers/interface.ts
new file mode 100644
index 0000000..21ab1ae
--- /dev/null
+++ b/typescript-practice/src/ts/helpers/interface.ts
@@ -0,0 +1,4 @@
+export interface dataObj {
+ id: string;
+ data: object;
+}
diff --git a/typescript-practice/src/ts/models/user.ts b/typescript-practice/src/ts/models/user.ts
new file mode 100644
index 0000000..f4129a6
--- /dev/null
+++ b/typescript-practice/src/ts/models/user.ts
@@ -0,0 +1,18 @@
+import { createIdUser } from '../helpers/helpers';
+
+export default class User {
+ private id: number;
+
+ private email: string;
+
+ private password: string;
+
+ private accessToken: string;
+
+ constructor(email: string, password: string, accessToken: string) {
+ this.id = createIdUser();
+ this.email = email;
+ this.password = password;
+ this.accessToken = accessToken;
+ }
+}
diff --git a/typescript-practice/src/ts/services/commonService.ts b/typescript-practice/src/ts/services/commonService.ts
index eb3d611..a6ff96c 100644
--- a/typescript-practice/src/ts/services/commonService.ts
+++ b/typescript-practice/src/ts/services/commonService.ts
@@ -1,43 +1,30 @@
import {
+ timeOutConnect,
convertDataObjectToModel,
convertModelToDataObject,
- timeOutConnect,
} from '../helpers/helpers';
+import { dataObj } from '../helpers/interface';
import FirebaseService from './firebaseService';
-export default class CommonService {
- constructor() {
- this.defaultPath = '/';
- this.firebaseService = FirebaseService;
- }
+export default class CommonService {
+ private defaultPath: string = '/';
+ private firebaseService = FirebaseService;
/**
- * Connect to Firebase Databse
+ * Connect to Firebase Database
*/
connectToDb() {
this.firebaseService.reconnect();
}
- async getDataFromProp(property, value, path = this.defaultPath) {
- this.connectToDb();
- const data = this.firebaseService.getDataFromProp(path, property, value);
- const result = await timeOutConnect(data);
-
- if (result.id && result.data) {
- return convertDataObjectToModel(result);
- }
-
- return null;
- }
-
/**
* Save data on database
* @param {*} data The data wants to save on database
* @param {string} path The path of database
*/
- async save(model) {
+ async save(model: T): Promise {
this.connectToDb();
- const results = convertModelToDataObject(model);
+ const results: T = convertModelToDataObject(model);
const saveData = this.firebaseService.save(
results.data,
@@ -53,52 +40,70 @@ export default class CommonService {
* @param {string} path The path of database
* @returns {Object || null} Return the object if has, otherwise return null
*/
- async getDataFromId(id, path = this.defaultPath) {
+ async getDataFromId(
+ id: string,
+ path: string = this.defaultPath,
+ ): Promise