Merge pull request #119 from DP6/refactor_cleanup

refactor: ♻️ cleaning variables, functions and typing
DP6 · Nov 9, 2021 · ad4ecb1 · ad4ecb1
2 parents 993eb90 + 5ab52cb
commit ad4ecb1
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 17 deletions.
diff --git a/dist/models/DAO/AgencyDAO.js b/dist/models/DAO/AgencyDAO.js
@@ -7,7 +7,6 @@ class AgencyDAO {
 	constructor() {
 		this._objectStore = FirestoreConnectionSingleton_1.FirestoreConnectionSingleton.getInstance();
 		this._pathToCollection = ['tokens'];
-		this._authCollection = this._objectStore.getCollection(this._pathToCollection);
 	}
 	getAllAgenciesFrom(company, agency, userRequestPermission) {
 		return this._objectStore
@@ -38,7 +37,7 @@ class AgencyDAO {
 				throw err;
 			});
 	}
-	getAllUsersFromAgency(company, agency, userRequestPermission) {
+	getAllUsersFromAgency(company, agency) {
 		return this._objectStore
 			.getCollection(this._pathToCollection)
 			.where('company', '==', company)

diff --git a/dist/models/DAO/CampaignDAO.js b/dist/models/DAO/CampaignDAO.js
@@ -58,8 +58,9 @@ class CampaignDAO {
 							if (
 								campaignInfos.campaignName &&
 								campaignInfos.campaignId &&
-								campaignInfos.campaignId &&
-								campaignInfos.campaignId &&
+								campaignInfos.agency &&
+								campaignInfos.activate !== null &&
+								campaignInfos.activate !== undefined &&
 								!campaigns.includes(campaignInfos)
 							) {
 								campaigns.push(campaignInfos);

diff --git a/dist/routes/agency.js b/dist/routes/agency.js
@@ -58,8 +58,10 @@ const agency = (app) => {
 	app.get('/agency/users', (req, res) =>
 		__awaiter(void 0, void 0, void 0, function* () {
 			const apiResponse = new ApiResponse_1.ApiResponse();
+			const company = req.company;
+			const agency = req.agency;
 			new AgencyDAO_1.AgencyDAO()
-				.getAllUsersFromAgency(req.company, req.agency, req.permission)
+				.getAllUsersFromAgency(company, agency)
 				.then((users) => {
 					apiResponse.responseText = JSON.stringify(users.map((user) => user.toJson()));
 				})

diff --git a/src/ts/models/DAO/AgencyDAO.ts b/src/ts/models/DAO/AgencyDAO.ts
@@ -1,17 +1,15 @@
 import { FirestoreConnectionSingleton } from '../cloud/FirestoreConnectionSingleton';
-import { CollectionReference, QuerySnapshot } from '@google-cloud/firestore';
+import { QuerySnapshot } from '@google-cloud/firestore';
 import { ObjectStore } from './ObjectStore';
 import { User } from '../User';
 
 export class AgencyDAO {
 	private _objectStore: ObjectStore;
 	private _pathToCollection: string[];
-	private _authCollection: CollectionReference;
 
 	constructor() {
 		this._objectStore = FirestoreConnectionSingleton.getInstance();
 		this._pathToCollection = ['tokens'];
-		this._authCollection = this._objectStore.getCollection(this._pathToCollection);
 	}
 
 	/**
@@ -21,7 +19,7 @@ export class AgencyDAO {
 	 * @param userRequestPermission permissão do usuario que solicitou a alteração
 	 * @returns Lista de agências
 	 */
-	public getAllAgenciesFrom(company: string, agency: string, userRequestPermission: string): Promise<string[] | void> {
+	public getAllAgenciesFrom(company: string, agency: string, userRequestPermission: string): Promise<string[]> {
 		return this._objectStore
 			.getCollection(['tokens'])
 			.where('company', '==', company)
@@ -55,10 +53,9 @@ export class AgencyDAO {
 	 * Retorna todos os usuários de uma determinada agência
 	 * @param company Empresa(company) dos usuários a serem buscados
 	 * @param agency Agência da qual usuários serão buscados
-	 * @param userRequestPermission permissão do usuario que solicitou a alteração
 	 * @returns Lista de usuários
 	 */
-	public getAllUsersFromAgency(company: string, agency: string, userRequestPermission: string): Promise<User[] | void> {
+	public getAllUsersFromAgency(company: string, agency: string): Promise<User[] | void> {
 		return this._objectStore
 			.getCollection(this._pathToCollection)
 			.where('company', '==', company)

diff --git a/src/ts/models/DAO/CampaignDAO.ts b/src/ts/models/DAO/CampaignDAO.ts
@@ -56,7 +56,7 @@ export class CampaignDAO {
 	public getAllCampaignsFrom(
 		agency: string,
 		userRequestPermission: string
-	): Promise<{ campaignName: string; campaignId: string }[]> {
+	): Promise<{ campaignName: string; campaignId: string; agency: string; activate: boolean }[]> {
 		return this._objectStore
 			.getCollection(this._pathToCollection)
 			.where('agency', '==', agency)
@@ -80,8 +80,9 @@ export class CampaignDAO {
 							if (
 								campaignInfos.campaignName &&
 								campaignInfos.campaignId &&
-								campaignInfos.campaignId &&
-								campaignInfos.campaignId &&
+								campaignInfos.agency &&
+								campaignInfos.activate !== null &&
+								campaignInfos.activate !== undefined &&
 								!campaigns.includes(campaignInfos)
 							) {
 								campaigns.push(campaignInfos);

diff --git a/src/ts/routes/agency.ts b/src/ts/routes/agency.ts
@@ -27,8 +27,11 @@ const agency = (app: { [key: string]: any }): void => {
 
 	app.get('/agency/users', async (req: { [key: string]: any }, res: { [key: string]: any }) => {
 		const apiResponse = new ApiResponse();
+		const company = req.company;
+		const agency = req.agency;
+
 		new AgencyDAO()
-			.getAllUsersFromAgency(req.company, req.agency, req.permission)
+			.getAllUsersFromAgency(company, agency)
 			.then((users: User[]) => {
 				apiResponse.responseText = JSON.stringify(users.map((user: User) => user.toJson()));
 			})

diff --git a/src/ts/routes/campaign.ts b/src/ts/routes/campaign.ts
@@ -55,12 +55,14 @@ const campaign = (app: { [key: string]: any }): void => {
 			return await new AgencyDAO().getAllAgenciesFrom(company, agency, permission);
 		};
 
-		const allAgencies: any = await gettingAgencies();
+		const allAgencies: string[] = await gettingAgencies();
 		if (permission === 'owner' || permission === 'admin') {
 			allAgencies.push('CompanyCampaigns');
 		}
 		if (permission === 'admin' || permission === ' owner') allAgencies.push('Campanhas Internas');
-		const agenciesToReturn: any = [];
+		const agenciesToReturn: {
+			[key: string]: { campaignName: string; campaignId: string; agency: string; activate: boolean }[];
+		}[] = [];
 		for await (const agencyInfos of allAgencies) {
 			try {
 				const campaignsObject = await new CampaignDAO().getAllCampaignsFrom(agencyInfos, permission);