Skip to content

Commit bc93017

Browse files
committed
Fix null to 0 properties values
1 parent bb4d392 commit bc93017

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

src/Service/TokenService.php

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -342,31 +342,36 @@ private function tokenMapping(array $dataJson, ?Token $token = null): Token
342342
$token->setMaticContract(isset($dataJson['maticContract']) ? $dataJson['maticContract'] : null);
343343
$token->setXDaiContract($dataJson['xDaiContract'] ?: null);
344344
$token->setTotalInvestment((float)$dataJson['totalInvestment'] ?: null);
345-
$token->setGrossRentMonth(isset($dataJson['grossRent']) ? (float)$dataJson['grossRent'] : $dataJson['grossRentMonth']);
346-
$token->setGrossRentYear($token->getGrossRentMonth() * 12?: null);
347-
$token->setPropertyManagementPercent((float)$dataJson['propertyManagementPercent'] ?: null);
345+
$token->setGrossRentMonth(isset($dataJson['grossRent']) ? (float)$dataJson['grossRent'] : 0);
346+
$token->setGrossRentYear($token->getGrossRentMonth() * 12 ?: 0);
347+
$token->setPropertyManagementPercent((float)$dataJson['propertyManagementPercent'] ?: 0);
348348
$token->setPropertyManagement(
349-
$token->getGrossRentMonth() * $token->getPropertyManagementPercent() ?: null
349+
$token->getGrossRentMonth() * $token->getPropertyManagementPercent() ?: 0
350350
);
351-
$token->setRealtPlatformPercent(isset($dataJson['realtPlatformPercent']) ? (float)$dataJson['realtPlatformPercent'] : null);
352-
$token->setRealtPlatform($token->getGrossRentMonth() * $token->getRealtPlatformPercent() ?: null);
353-
$token->setInsurance((float)$dataJson['insurance'] ?: null);
354-
$token->setPropertyTaxes((float)$dataJson['propertyTaxes'] ?: null);
355-
$token->setUtilities((float)$dataJson['utilities'] ?: null);
356-
$token->setPropertyMaintenanceMonthly((float)$dataJson['propertyMaintenanceMonthly'] ?: null);
351+
$token->setRealtPlatformPercent(isset($dataJson['realtPlatformPercent'])
352+
? (float)$dataJson['realtPlatformPercent']
353+
: 0
354+
);
355+
$token->setRealtPlatform($token->getGrossRentMonth() * $token->getRealtPlatformPercent() ?: 0);
356+
$token->setInsurance((float)$dataJson['insurance'] ?: 0);
357+
$token->setPropertyTaxes((float)$dataJson['propertyTaxes'] ?: 0);
358+
$token->setUtilities((float)$dataJson['utilities'] ?: 0);
359+
$token->setPropertyMaintenanceMonthly((float)$dataJson['propertyMaintenanceMonthly'] ?: 0);
357360
$token->setNetRentMonth(
358361
($token->getGrossRentMonth()
359362
- $token->getPropertyManagement()
360363
- $token->getRealtPlatform()
361364
- $token->getPropertyTaxes()
362365
- $token->getInsurance()
363366
- $token->getUtilities()
364-
- $token->getPropertyMaintenanceMonthly()) ?: null);
365-
$token->setNetRentYear($token->getNetRentMonth() * 12 ?: null);
366-
$token->setNetRentDay($token->getNetRentYear() / 365 ?: null);
367-
$token->setNetRentYearPerToken(!empty($token->getTotalTokens()) ? $token->getNetRentYear() / $token->getTotalTokens() : 0);
368-
$token->setNetRentMonthPerToken($token->getNetRentYearPerToken() / 12 ?: null);
369-
$token->setNetRentDayPerToken($token->getNetRentYearPerToken() / 365 ?: null);
367+
- $token->getPropertyMaintenanceMonthly()) ?: 0);
368+
$token->setNetRentYear($token->getNetRentMonth() * 12 ?: 0);
369+
$token->setNetRentDay($token->getNetRentYear() / 365 ?: 0);
370+
$token->setNetRentYearPerToken(!empty($token->getTotalTokens())
371+
? $token->getNetRentYear() / $token->getTotalTokens()
372+
: 0);
373+
$token->setNetRentMonthPerToken($token->getNetRentYearPerToken() / 12 ?: 0);
374+
$token->setNetRentDayPerToken($token->getNetRentYearPerToken() / 365 ?: 0);
370375
$token->setAnnualPercentageYield($token->getTotalInvestment()
371376
? $token->getNetRentYear() / $token->getTotalInvestment() * 100
372377
: null
@@ -382,7 +387,7 @@ private function tokenMapping(array $dataJson, ?Token $token = null): Token
382387
$token->setLotSize($dataJson['lotSize'] ?: null);
383388
$token->setBedroomBath(!empty($dataJson['bedroom/bath']) ? $dataJson['bedroom/bath'] : null);
384389
$token->setHasTenants($dataJson['hasTenants'] ?: null);
385-
$token->setRentedUnits($dataJson['rentedUnits'] ?: null);
390+
$token->setRentedUnits($dataJson['rentedUnits'] ?: 0);
386391
$token->setTotalUnits($dataJson['totalUnits'] ?: null);
387392
$token->setTermOfLease($dataJson['termOfLease'] ?: null);
388393
$token->setRenewalDate(null);

0 commit comments

Comments
 (0)