From 507b59b816ca166ddfe75d0cc7c97a9ee7fb6800 Mon Sep 17 00:00:00 2001
From: Maciej Sikorski <maciejsikorski00@gmail.com>
Date: Fri, 17 Jan 2020 12:04:37 +0100
Subject: [PATCH] feat(pmp-api): add id to repository model

---
 .../core/src/lib/services/prs.service.ts      | 20 -------------------
 .../entities/github-repository.entity.ts      |  1 +
 .../lib/mappers/github-repository.mapper.ts   |  1 +
 .../src/lib/models/base-repository.model.ts   |  1 +
 .../base-repository-statistics.read-model.ts  |  2 ++
 .../repository-user-statistics.read-model.ts  |  3 ---
 .../models/repository-statistics.interface.ts |  1 +
 7 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts b/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts
index fcf13e00..55ee60d9 100644
--- a/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts
+++ b/libs/pmp-api/api-service/repository/core/src/lib/services/prs.service.ts
@@ -34,24 +34,4 @@ export class PrsService {
       )
     );
   }
-
-  getRepositoryPrStatisticsReadModel(
-    repository: RepositoryModel,
-    prsDetails: PrDetailsModel[]
-  ): RepositoryPrsStatisticsReadModel {
-    return {
-      name: repository.name,
-      fullName: repository.fullName,
-      owner: repository.owner,
-      pictureUrl: repository.pictureUrl,
-      prsStatistics: prsDetails.map(
-        prDetails =>
-          new PrStatisticsReadModel(prDetails, {
-            additions: prDetails.additions,
-            changes: prDetails.changedFiles,
-            deletions: prDetails.deletions
-          })
-      )
-    };
-  }
 }
diff --git a/libs/pmp-api/api-service/repository/data-access/src/lib/domain/entities/github-repository.entity.ts b/libs/pmp-api/api-service/repository/data-access/src/lib/domain/entities/github-repository.entity.ts
index 56481f1a..1703984e 100644
--- a/libs/pmp-api/api-service/repository/data-access/src/lib/domain/entities/github-repository.entity.ts
+++ b/libs/pmp-api/api-service/repository/data-access/src/lib/domain/entities/github-repository.entity.ts
@@ -2,6 +2,7 @@ import { GithubUserEntity } from './github-user.entity';
 import { GithubOrganizationEntity } from './github-organization.entity';
 
 export interface GithubRepositoryEntity {
+  id: number;
   owner: GithubUserEntity;
   name: string;
   full_name: string;
diff --git a/libs/pmp-api/api-service/repository/data-access/src/lib/mappers/github-repository.mapper.ts b/libs/pmp-api/api-service/repository/data-access/src/lib/mappers/github-repository.mapper.ts
index 5b21730e..3809fb33 100644
--- a/libs/pmp-api/api-service/repository/data-access/src/lib/mappers/github-repository.mapper.ts
+++ b/libs/pmp-api/api-service/repository/data-access/src/lib/mappers/github-repository.mapper.ts
@@ -8,6 +8,7 @@ export class GithubRepositoryMapper implements Mapper<GithubRepositoryEntity, Re
   mapFrom(param: GithubRepositoryEntity): RepositoryModel {
     return {
       fullName: param.full_name,
+      id: param.id,
       name: param.name,
       owner: param.owner.login,
       prs: [],
diff --git a/libs/pmp-api/api-service/repository/domain/src/lib/models/base-repository.model.ts b/libs/pmp-api/api-service/repository/domain/src/lib/models/base-repository.model.ts
index 302952d3..50ede085 100644
--- a/libs/pmp-api/api-service/repository/domain/src/lib/models/base-repository.model.ts
+++ b/libs/pmp-api/api-service/repository/domain/src/lib/models/base-repository.model.ts
@@ -1,4 +1,5 @@
 export abstract class BaseRepositoryModel {
+  id: number;
   fullName: string;
   name: string;
   owner: string;
diff --git a/libs/pmp-api/api-service/repository/domain/src/lib/read-models/base-repository-statistics.read-model.ts b/libs/pmp-api/api-service/repository/domain/src/lib/read-models/base-repository-statistics.read-model.ts
index a94aaf8f..240c44d2 100644
--- a/libs/pmp-api/api-service/repository/domain/src/lib/read-models/base-repository-statistics.read-model.ts
+++ b/libs/pmp-api/api-service/repository/domain/src/lib/read-models/base-repository-statistics.read-model.ts
@@ -5,6 +5,7 @@ import {
 } from '@pimp-my-pr/pmp-api/api-service/repository/domain';
 
 export abstract class BaseRepositoryStatisticsReadModel {
+  id: number;
   linesOfCodeToCheck: number;
   longestPrLinesOfCode?: number;
   name: string;
@@ -12,6 +13,7 @@ export abstract class BaseRepositoryStatisticsReadModel {
   sumOfHoursPrsWaiting?: number;
 
   protected constructor(model: RepositoryModel | UserModel, prs: PrWithChangesReadModel[]) {
+    this.id = model.id;
     this.name = model.name;
     this.pendingPrs = prs.length;
     this.sumOfHoursPrsWaiting = this.getSumOfHoursPrsWaiting(prs);
diff --git a/libs/pmp-api/api-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts b/libs/pmp-api/api-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts
index 866a6d1e..35931d0f 100644
--- a/libs/pmp-api/api-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts
+++ b/libs/pmp-api/api-service/repository/domain/src/lib/read-models/repository-user-statistics.read-model.ts
@@ -3,10 +3,7 @@ import { PrWithChangesReadModel } from './pr-with-changes.read-model';
 import { UserModel } from '../models/user.model';
 
 export class RepositoryUserStatisticsReadModel extends BaseRepositoryStatisticsReadModel {
-  id: number;
-
   constructor(userModel: UserModel, prsModel: PrWithChangesReadModel[]) {
     super(userModel, prsModel);
-    this.id = userModel.id;
   }
 }
diff --git a/libs/shared/domain/src/lib/models/repository-statistics.interface.ts b/libs/shared/domain/src/lib/models/repository-statistics.interface.ts
index eddb4a66..a3270e86 100644
--- a/libs/shared/domain/src/lib/models/repository-statistics.interface.ts
+++ b/libs/shared/domain/src/lib/models/repository-statistics.interface.ts
@@ -1,4 +1,5 @@
 export interface RepositoryStatistics {
+  id: number;
   name: string;
   linesOfCodeToCheck?: number;
   longestPrLinesOfCode?: number;