From 7808f9ec64abaf3d2c8f4fd0cc3c6f567d8b2f92 Mon Sep 17 00:00:00 2001
From: DE BAERDEMAEKER Mathieu <mathieu.debaerdemaeker@axa.fr>
Date: Tue, 12 Jan 2021 16:45:42 +0100
Subject: [PATCH] feat(reviewers): adding reviewing data

---
 src/components/Pullrequest/Pullrequest.svelte | 19 ++++++-
 src/mappers/Mapper.ts                         |  2 +-
 src/mappers/Review.mapper.ts                  | 56 +++++++++++++++++++
 src/mappers/index.ts                          |  2 +
 src/models/api/ReviewsApiType.ts              |  6 +-
 src/models/api/index.ts                       |  3 +
 src/models/skizzle/ReviewType.ts              |  6 +-
 src/services/OAuthAzureDevOps.service.ts      |  9 +--
 src/services/OAuthGithub.service.ts           |  9 +--
 src/services/Service.ts                       |  4 +-
 10 files changed, 95 insertions(+), 21 deletions(-)
 create mode 100644 src/mappers/Review.mapper.ts

diff --git a/src/components/Pullrequest/Pullrequest.svelte b/src/components/Pullrequest/Pullrequest.svelte
index fb10612..8bed120 100644
--- a/src/components/Pullrequest/Pullrequest.svelte
+++ b/src/components/Pullrequest/Pullrequest.svelte
@@ -105,8 +105,23 @@
 		border: none;
 		background-color: transparent;
 	}
+
+	.counter {
+		display: inline-block;
+		width: 1.5rem;
+		height: 1.5rem;
+		border-radius: 50%;
+		text-align: center;
+		line-height: 1.5rem;
+		color: #fff;
+		font-size: 0.75rem;
+		vertical-align: middle;
+		font-weight: bold;
+		background-color: #20aa20;
+	}
 </style>
 
+
 <div class="pr">
 	<button
 		class="link"
@@ -127,7 +142,9 @@
 	</div>
 	<footer>
 		{#await Service.getReviews(pullRequest.provider, { pullRequest }) then reviews}
-			<div />
+			{#each Object.entries(reviews) as [key, value]}
+				<p>{key}: <span class="counter">{value}</span></p>
+			{/each}
 		{/await}
 		<Labels labels={pullRequest.labels} />
 		<button
diff --git a/src/mappers/Mapper.ts b/src/mappers/Mapper.ts
index 9ca0777..857213e 100644
--- a/src/mappers/Mapper.ts
+++ b/src/mappers/Mapper.ts
@@ -1,5 +1,5 @@
 export type From<T1, T2> = T1 & T2;
 
 export abstract class Mapper<From, Result> {
-	public abstract to(data: From[] | From, params: any): Result[] | Result;
+	public abstract to(data: From[] | From, params?: any): Result[] | Result;
 }
diff --git a/src/mappers/Review.mapper.ts b/src/mappers/Review.mapper.ts
new file mode 100644
index 0000000..c401e1e
--- /dev/null
+++ b/src/mappers/Review.mapper.ts
@@ -0,0 +1,56 @@
+import {
+	AzureDevOpsReviewApiType,
+	AzureDevOpsVoteEnum,
+	GithubReviewApiType,
+	GithubVoteEnum,
+} from 'models/api';
+import type { ReviewType } from 'models/skizzle';
+import { From, Mapper } from './Mapper';
+
+export type ReviewMapperType = From<
+	AzureDevOpsReviewApiType,
+	GithubReviewApiType
+>;
+
+export class ReviewMapper extends Mapper<ReviewMapperType, ReviewType> {
+	public to(data: ReviewMapperType[]): ReviewType {
+		return data.reduce((acc, curr) => {
+			let key = curr.vote || curr.state;
+			let result = key.toString();
+
+			switch (key) {
+				case AzureDevOpsVoteEnum.Approved:
+				case GithubVoteEnum.Approved:
+					result = 'Validée';
+					break;
+				case AzureDevOpsVoteEnum.ApproveWithSuggestions:
+					result = 'Validée avec suggestion(s)';
+					break;
+				case GithubVoteEnum.Comment:
+					result = 'Commentaire(s)';
+					break;
+				case AzureDevOpsVoteEnum.WaitingForAuthor:
+				case GithubVoteEnum.Pending:
+					result = 'En attente';
+					break;
+				case AzureDevOpsVoteEnum.Rejected:
+					result = 'Refusée';
+					break;
+				case GithubVoteEnum.RequestChange:
+					result = 'Demande de changement';
+					break;
+				default:
+					result = "Pas d'avis";
+					break;
+			}
+
+			if (!acc[result]) {
+				acc[result] = 0;
+			}
+
+			acc[result] = acc[result] + 1;
+
+			return acc;
+		}, {} as ReviewType);
+	}
+}
diff --git a/src/mappers/index.ts b/src/mappers/index.ts
index e1a7a0b..fb9899e 100644
--- a/src/mappers/index.ts
+++ b/src/mappers/index.ts
@@ -7,6 +7,7 @@ import { ProfileMapper, ProfileMapperType } from './Profile.mapper';
 import { ProjectMapper, ProjectMapperType } from './Project.mapper';
 import { PullRequestMapper, PullRequestMapperType } from './PullRequest.mapper';
 import { RepositoryMapper, RepositoryMapperType } from './Repository.mapper';
+import { ReviewMapper } from './Review.mapper';
 import { Mapper } from './Mapper';
 
 export {
@@ -16,6 +17,7 @@ export {
 	ProjectMapper,
 	PullRequestMapper,
 	RepositoryMapper,
+	ReviewMapper,
 	Mapper,
 };
 
diff --git a/src/models/api/ReviewsApiType.ts b/src/models/api/ReviewsApiType.ts
index 73d6fe3..0601702 100644
--- a/src/models/api/ReviewsApiType.ts
+++ b/src/models/api/ReviewsApiType.ts
@@ -12,9 +12,9 @@ enum AzureDevOpsVoteEnum {
 
 enum GithubVoteEnum {
 	Approved = 'APPROVED',
-	RequestChange = 'REQUEST_CHANGE',
+	RequestChange = 'CHANGES_REQUESTED',
 	Pending = 'PENDING',
-	Comment = 'COMMENT',
+	Comment = 'COMMENTED',
 }
 
 type AzureDevOpsReviewApiType = {
@@ -40,3 +40,5 @@ export type {
 	GithubReviewApiType,
 	GithubReviewsApiType,
 };
+
+export { AzureDevOpsVoteEnum, GithubVoteEnum };
diff --git a/src/models/api/index.ts b/src/models/api/index.ts
index 61e8d7b..4e3f1f8 100644
--- a/src/models/api/index.ts
+++ b/src/models/api/index.ts
@@ -57,6 +57,7 @@ import {
 	AzureDevOpsCommentApiEnum,
 	GithubUserEnum,
 } from './CommentsApiType';
+import { AzureDevOpsVoteEnum, GithubVoteEnum } from './ReviewsApiType';
 
 export type {
 	IdentityType,
@@ -102,4 +103,6 @@ export {
 	AzureDevOpsCommentStatusApiEnum,
 	AzureDevOpsCommentApiEnum,
 	GithubUserEnum,
+	AzureDevOpsVoteEnum,
+	GithubVoteEnum,
 };
diff --git a/src/models/skizzle/ReviewType.ts b/src/models/skizzle/ReviewType.ts
index 927a3e0..bd951d5 100644
--- a/src/models/skizzle/ReviewType.ts
+++ b/src/models/skizzle/ReviewType.ts
@@ -1,3 +1,3 @@
-export type ReviewType = {
-	approved: boolean;
-};
+import type { Dictionary } from 'shared/utils';
+
+export type ReviewType = Dictionary<number>;
diff --git a/src/services/OAuthAzureDevOps.service.ts b/src/services/OAuthAzureDevOps.service.ts
index 8d1c685..2b064b4 100644
--- a/src/services/OAuthAzureDevOps.service.ts
+++ b/src/services/OAuthAzureDevOps.service.ts
@@ -5,6 +5,7 @@ import {
 	ProjectMapper,
 	PullRequestMapper,
 	RepositoryMapper,
+	ReviewMapper,
 } from 'mappers';
 import {
 	AzureDevOpsCommentApiEnum,
@@ -185,9 +186,7 @@ export class OAuthAzureDevOpsService implements IService {
 		return mapper.to(comments, { provider: this.provider, organizationName });
 	}
 
-	public async getReviews({
-		pullRequest,
-	}: ServiceParams): Promise<ReviewType[]> {
+	public async getReviews({ pullRequest }: ServiceParams): Promise<ReviewType> {
 		const {
 			repositoryId,
 			pullRequestId,
@@ -202,8 +201,6 @@ export class OAuthAzureDevOpsService implements IService {
 			pullRequestId,
 		);
 
-		console.log(pullRequest.provider, { result });
-
-		return [];
+		return new ReviewMapper().to(result);
 	}
 }
diff --git a/src/services/OAuthGithub.service.ts b/src/services/OAuthGithub.service.ts
index 980174f..25acde3 100644
--- a/src/services/OAuthGithub.service.ts
+++ b/src/services/OAuthGithub.service.ts
@@ -3,6 +3,7 @@ import {
 	ProfileMapper,
 	PullRequestMapper,
 	RepositoryMapper,
+	ReviewMapper,
 } from 'mappers';
 import { GithubUserEnum } from 'models/api';
 import type {
@@ -103,9 +104,7 @@ export class OAuthGithubService implements IService {
 		return mapper.to(comments, { provider: this.provider });
 	}
 
-	public async getReviews({
-		pullRequest,
-	}: ServiceParams): Promise<ReviewType[]> {
+	public async getReviews({ pullRequest }: ServiceParams): Promise<ReviewType> {
 		const { repositoryName, pullRequestId, owner } = pullRequest;
 
 		const result = await this.requester.getReviews(
@@ -114,8 +113,6 @@ export class OAuthGithubService implements IService {
 			pullRequestId,
 		);
 
-		console.log(pullRequest.provider, pullRequest.title, { result });
-
-		return [];
+		return new ReviewMapper().to(result);
 	}
 }
diff --git a/src/services/Service.ts b/src/services/Service.ts
index 66a64aa..cda64fe 100644
--- a/src/services/Service.ts
+++ b/src/services/Service.ts
@@ -31,7 +31,7 @@ export interface IService {
 	getRepositories(params: ServiceParams): Promise<RepositoryType[]>;
 	getPullRequests(params: ServiceParams): Promise<PullRequestType[]>;
 	getComments(params: ServiceParams): Promise<CommentType[]>;
-	getReviews(params: ServiceParams): Promise<ReviewType[]>;
+	getReviews(params: ServiceParams): Promise<ReviewType>;
 }
 
 export class Service {
@@ -117,7 +117,7 @@ export class Service {
 	public static async getReviews(
 		provider: ProviderEnum,
 		params: ServiceParams,
-	): Promise<ReviewType[]> {
+	): Promise<ReviewType> {
 		isFetchingData.set(true);
 		const result = await Service.INSTANCES[provider].getReviews(params);
 		isFetchingData.set(false);