From 91b41bdca9f35d25907a0525e0fc97160f942cd5 Mon Sep 17 00:00:00 2001
From: BryannYeap <e0543723@u.nus.edu>
Date: Wed, 19 Oct 2022 14:12:50 +0800
Subject: [PATCH] [offers][fix] Fix type definitions for OffersCompany in
 types/offers

---
 apps/portal/src/mappers/offers-mappers.ts | 10 ++++------
 apps/portal/src/types/offers.d.ts         | 10 +++++-----
 2 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/apps/portal/src/mappers/offers-mappers.ts b/apps/portal/src/mappers/offers-mappers.ts
index 6b570323..1a6e415c 100644
--- a/apps/portal/src/mappers/offers-mappers.ts
+++ b/apps/portal/src/mappers/offers-mappers.ts
@@ -219,11 +219,7 @@ export const valuationDtoMapper = (currency: {
   return valuationDto;
 };
 
-export const offersCompanyDtoMapper = (company: Company | null) => {
-  if (!company) {
-    return null;
-  }
-
+export const offersCompanyDtoMapper = (company: Company) => {
   const companyDto: OffersCompany = {
     createdAt: company.createdAt,
     description: company?.description ?? '',
@@ -264,7 +260,9 @@ export const experienceDtoMapper = (
   },
 ) => {
   const experienceDto: Experience = {
-    company: offersCompanyDtoMapper(experience.company),
+    company: experience.company
+      ? offersCompanyDtoMapper(experience.company)
+      : null,
     durationInMonths: experience.durationInMonths,
     id: experience.id,
     jobType: experience.jobType,
diff --git a/apps/portal/src/types/offers.d.ts b/apps/portal/src/types/offers.d.ts
index c6724611..35539b45 100644
--- a/apps/portal/src/types/offers.d.ts
+++ b/apps/portal/src/types/offers.d.ts
@@ -19,7 +19,7 @@ export type Background = {
 };
 
 export type Experience = {
-  company: Company?;
+  company: OffersCompany?;
   durationInMonths: number?;
   id: string;
   jobType: JobType?;
@@ -61,7 +61,7 @@ export type SpecificYoe = {
 };
 
 export type DashboardOffer = {
-  company: Company;
+  company: OffersCompany;
   id: string;
   income: Valuation;
   monthYearReceived: Date;
@@ -72,7 +72,7 @@ export type DashboardOffer = {
 
 export type ProfileOffer = {
   comments: string;
-  company: Company;
+  company: OffersCompany;
   id: string;
   jobType: JobType;
   location: string;
@@ -155,7 +155,7 @@ export type Analysis = {
 };
 
 export type AnalysisHighestOffer = {
-  company: Company;
+  company: OffersCompany;
   id: string;
   level: string;
   location: string;
@@ -164,7 +164,7 @@ export type AnalysisHighestOffer = {
 };
 
 export type AnalysisOffer = {
-  company: Company;
+  company: OffersCompany;
   id: string;
   income: number;
   jobType: JobType;