Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Ecolyo
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
web-et-numerique
Factory
LLLE_Project
Ecolyo
Commits
a3f22fec
Commit
a3f22fec
authored
2 years ago
by
Hugo SUBTIL
Browse files
Options
Downloads
Patches
Plain Diff
fix(lint): fix format
parent
bb4adfc6
No related branches found
No related tags found
1 merge request
!683
chore(release): 1.10.0
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/services/consumption.service.ts
+52
-53
52 additions, 53 deletions
src/services/consumption.service.ts
src/services/performanceIndicator.service.spec.ts
+24
-18
24 additions, 18 deletions
src/services/performanceIndicator.service.spec.ts
with
76 additions
and
71 deletions
src/services/consumption.service.ts
+
52
−
53
View file @
a3f22fec
...
@@ -12,7 +12,7 @@ import {
...
@@ -12,7 +12,7 @@ import {
DataloadValueDetail
,
DataloadValueDetail
,
FluidStatus
,
FluidStatus
,
PerformanceIndicator
,
PerformanceIndicator
,
TimePeriod
TimePeriod
,
}
from
'
models
'
}
from
'
models
'
import
{
EnedisMonthlyAnalysisData
}
from
'
models/enedisMonthlyAnalysis
'
import
{
EnedisMonthlyAnalysisData
}
from
'
models/enedisMonthlyAnalysis
'
import
ConsumptionFormatterService
from
'
services/consumptionFormatter.service
'
import
ConsumptionFormatterService
from
'
services/consumptionFormatter.service
'
...
@@ -57,22 +57,24 @@ export default class ConsumptionDataManager {
...
@@ -57,22 +57,24 @@ export default class ConsumptionDataManager {
compareTimePeriod
?:
TimePeriod
,
compareTimePeriod
?:
TimePeriod
,
isHome
?:
boolean
isHome
?:
boolean
):
Promise
<
Datachart
|
null
>
{
):
Promise
<
Datachart
|
null
>
{
const
InputisValid
:
boolean
=
this
.
_consumptionValidatorService
.
ValidateGetGraphData
(
const
InputisValid
:
boolean
=
timePeriod
,
this
.
_consumptionValidatorService
.
ValidateGetGraphData
(
timeStep
,
fluidTypes
,
compareTimePeriod
)
if
(
!
InputisValid
)
return
null
if
(
fluidTypes
.
length
===
1
&&
!
isHome
)
{
const
fluidType
:
FluidType
=
fluidTypes
[
0
]
// running the query
const
fetchedData
:
Datachart
|
null
=
await
this
.
fetchSingleFluidGraphData
(
timePeriod
,
timePeriod
,
timeStep
,
timeStep
,
fluidType
,
fluidType
s
,
compareTimePeriod
compareTimePeriod
)
)
if
(
!
InputisValid
)
return
null
if
(
fluidTypes
.
length
===
1
&&
!
isHome
)
{
const
fluidType
:
FluidType
=
fluidTypes
[
0
]
// running the query
const
fetchedData
:
Datachart
|
null
=
await
this
.
fetchSingleFluidGraphData
(
timePeriod
,
timeStep
,
fluidType
,
compareTimePeriod
)
// formatting data
// formatting data
const
formattedData
:
Datachart
|
null
=
this
.
formatGraphDataManager
(
const
formattedData
:
Datachart
|
null
=
this
.
formatGraphDataManager
(
...
@@ -108,9 +110,8 @@ export default class ConsumptionDataManager {
...
@@ -108,9 +110,8 @@ export default class ConsumptionDataManager {
chartFluid
:
fluidType
,
chartFluid
:
fluidType
,
})
})
}
}
const
aggregatedData
:
Datachart
|
null
=
this
.
aggregateGraphData
(
const
aggregatedData
:
Datachart
|
null
=
toBeAgreggatedData
this
.
aggregateGraphData
(
toBeAgreggatedData
)
)
return
aggregatedData
return
aggregatedData
}
else
return
null
}
else
return
null
}
}
...
@@ -152,9 +153,7 @@ export default class ConsumptionDataManager {
...
@@ -152,9 +153,7 @@ export default class ConsumptionDataManager {
fluidTypes
:
FluidType
fluidTypes
:
FluidType
):
Promise
<
Dataload
[]
|
null
>
{
):
Promise
<
Dataload
[]
|
null
>
{
const
timePeriod
=
{
const
timePeriod
=
{
startDate
:
DateTime
.
now
()
startDate
:
DateTime
.
now
().
plus
({
days
:
-
3
}).
startOf
(
'
day
'
),
.
plus
({
days
:
-
3
})
.
startOf
(
'
day
'
),
endDate
:
DateTime
.
now
(),
endDate
:
DateTime
.
now
(),
}
}
...
@@ -199,9 +198,8 @@ export default class ConsumptionDataManager {
...
@@ -199,9 +198,8 @@ export default class ConsumptionDataManager {
graphData
.
actualData
graphData
.
actualData
)
)
if
(
graphData
.
actualData
[
0
].
price
)
if
(
graphData
.
actualData
[
0
].
price
)
performanceIndicator
.
price
=
this
.
calculatePerformanceIndicatorPrice
(
performanceIndicator
.
price
=
graphData
.
actualData
this
.
calculatePerformanceIndicatorPrice
(
graphData
.
actualData
)
)
}
}
if
(
if
(
...
@@ -213,10 +211,11 @@ export default class ConsumptionDataManager {
...
@@ -213,10 +211,11 @@ export default class ConsumptionDataManager {
graphData
.
comparisonData
graphData
.
comparisonData
)
)
performanceIndicator
.
compareValue
=
comparisonSumValue
performanceIndicator
.
compareValue
=
comparisonSumValue
performanceIndicator
.
percentageVariation
=
this
.
calculatePerformanceIndicatorVariationPercentage
(
performanceIndicator
.
percentageVariation
=
performanceIndicator
.
value
||
0
,
this
.
calculatePerformanceIndicatorVariationPercentage
(
comparisonSumValue
performanceIndicator
.
value
||
0
,
)
comparisonSumValue
)
}
}
performanceIndicators
[
fluidType
]
=
performanceIndicator
performanceIndicators
[
fluidType
]
=
performanceIndicator
...
@@ -302,24 +301,26 @@ export default class ConsumptionDataManager {
...
@@ -302,24 +301,26 @@ export default class ConsumptionDataManager {
):
Datachart
|
null
{
):
Datachart
|
null
{
if
(
!
data
)
return
null
if
(
!
data
)
return
null
const
formattedActualData
:
Dataload
[]
=
this
.
_consumptionFormatterService
.
formatGraphData
(
const
formattedActualData
:
Dataload
[]
=
data
.
actualData
,
this
.
_consumptionFormatterService
.
formatGraphData
(
timePeriod
,
data
.
actualData
,
timeStep
,
timePeriod
,
fluidType
,
fluidStatus
)
let
formattedComparisonData
:
Dataload
[]
|
null
=
null
if
(
compareTimePeriod
)
formattedComparisonData
=
this
.
_consumptionFormatterService
.
formatGraphData
(
data
.
comparisonData
?
data
.
comparisonData
:
[],
compareTimePeriod
,
timeStep
,
timeStep
,
fluidType
,
fluidType
,
fluidStatus
fluidStatus
)
)
let
formattedComparisonData
:
Dataload
[]
|
null
=
null
if
(
compareTimePeriod
)
formattedComparisonData
=
this
.
_consumptionFormatterService
.
formatGraphData
(
data
.
comparisonData
?
data
.
comparisonData
:
[],
compareTimePeriod
,
timeStep
,
fluidType
,
fluidStatus
)
const
result
:
Datachart
=
{
const
result
:
Datachart
=
{
actualData
:
formattedActualData
,
actualData
:
formattedActualData
,
comparisonData
:
formattedComparisonData
,
comparisonData
:
formattedComparisonData
,
...
@@ -490,9 +491,10 @@ export default class ConsumptionDataManager {
...
@@ -490,9 +491,10 @@ export default class ConsumptionDataManager {
if
(
singleFluidCharts
[
0
].
chartData
.
actualData
[
i
])
{
if
(
singleFluidCharts
[
0
].
chartData
.
actualData
[
i
])
{
// Define the aggregated state
// Define the aggregated state
const
aggregatedDataloadState
:
DataloadState
=
this
.
_consumptionFormatterService
.
defineAggregatedDataloadState
(
const
aggregatedDataloadState
:
DataloadState
=
tempAggregatedState
this
.
_consumptionFormatterService
.
defineAggregatedDataloadState
(
)
tempAggregatedState
)
const
acutaldataLoad
:
Dataload
=
{
const
acutaldataLoad
:
Dataload
=
{
date
:
singleFluidCharts
[
0
].
chartData
.
actualData
[
i
].
date
,
date
:
singleFluidCharts
[
0
].
chartData
.
actualData
[
i
].
date
,
value
:
agreggatedConvertedValue
,
value
:
agreggatedConvertedValue
,
...
@@ -509,9 +511,10 @@ export default class ConsumptionDataManager {
...
@@ -509,9 +511,10 @@ export default class ConsumptionDataManager {
singleFluidCharts
[
0
].
chartData
.
comparisonData
[
i
]
singleFluidCharts
[
0
].
chartData
.
comparisonData
[
i
]
)
{
)
{
// Define the aggregated state
// Define the aggregated state
const
aggregatedComparisonDataloadState
:
DataloadState
=
this
.
_consumptionFormatterService
.
defineAggregatedDataloadState
(
const
aggregatedComparisonDataloadState
:
DataloadState
=
tempComparisonAggregatedState
this
.
_consumptionFormatterService
.
defineAggregatedDataloadState
(
)
tempComparisonAggregatedState
)
const
comparisondataLoad
:
Dataload
=
{
const
comparisondataLoad
:
Dataload
=
{
date
:
singleFluidCharts
[
0
].
chartData
.
comparisonData
[
i
].
date
,
date
:
singleFluidCharts
[
0
].
chartData
.
comparisonData
[
i
].
date
,
value
:
comparisonAgreggatedConvertedValue
,
value
:
comparisonAgreggatedConvertedValue
,
...
@@ -598,9 +601,8 @@ export default class ConsumptionDataManager {
...
@@ -598,9 +601,8 @@ export default class ConsumptionDataManager {
public
async
saveDoc
(
public
async
saveDoc
(
consumptionDoc
:
DataloadEntity
consumptionDoc
:
DataloadEntity
):
Promise
<
DataloadEntity
>
{
):
Promise
<
DataloadEntity
>
{
const
{
const
{
data
:
savedDoc
}:
QueryResult
<
DataloadEntity
>
=
data
:
savedDoc
,
await
this
.
_client
.
save
(
consumptionDoc
)
}:
QueryResult
<
DataloadEntity
>
=
await
this
.
_client
.
save
(
consumptionDoc
)
return
savedDoc
return
savedDoc
}
}
...
@@ -612,11 +614,8 @@ export default class ConsumptionDataManager {
...
@@ -612,11 +614,8 @@ export default class ConsumptionDataManager {
public
async
saveDocs
(
public
async
saveDocs
(
consumptionDocs
:
DataloadEntity
[]
consumptionDocs
:
DataloadEntity
[]
):
Promise
<
DataloadEntity
[]
>
{
):
Promise
<
DataloadEntity
[]
>
{
const
{
const
{
data
:
savedDocs
}:
QueryResult
<
DataloadEntity
[]
>
=
data
:
savedDocs
,
await
this
.
_client
.
saveAll
(
consumptionDocs
)
}:
QueryResult
<
DataloadEntity
[]
>
=
await
this
.
_client
.
saveAll
(
consumptionDocs
)
return
savedDocs
return
savedDocs
}
}
...
...
This diff is collapsed.
Click to expand it.
src/services/performanceIndicator.service.spec.ts
+
24
−
18
View file @
a3f22fec
...
@@ -28,9 +28,10 @@ describe('performanceIndicator service', () => {
...
@@ -28,9 +28,10 @@ describe('performanceIndicator service', () => {
compareValue
:
7.84615
,
compareValue
:
7.84615
,
percentageVariation
:
-
0.26191826564620857
,
percentageVariation
:
-
0.26191826564620857
,
}
}
let
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
let
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
//Only two values
//Only two values
...
@@ -51,9 +52,10 @@ describe('performanceIndicator service', () => {
...
@@ -51,9 +52,10 @@ describe('performanceIndicator service', () => {
compareValue
:
5.26785
,
compareValue
:
5.26785
,
percentageVariation
:
-
0.6454720616570329
,
percentageVariation
:
-
0.6454720616570329
,
}
}
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
//lack of value for one
//lack of value for one
...
@@ -79,9 +81,10 @@ describe('performanceIndicator service', () => {
...
@@ -79,9 +81,10 @@ describe('performanceIndicator service', () => {
percentageVariation
:
-
0.48368308023680406
,
percentageVariation
:
-
0.48368308023680406
,
value
:
4.0511
,
value
:
4.0511
,
}
}
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
//lack of compareValue for one
//lack of compareValue for one
...
@@ -107,9 +110,10 @@ describe('performanceIndicator service', () => {
...
@@ -107,9 +110,10 @@ describe('performanceIndicator service', () => {
compareValue
:
0
,
compareValue
:
0
,
percentageVariation
:
Infinity
,
percentageVariation
:
Infinity
,
}
}
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
//Only one with no compared value
//Only one with no compared value
...
@@ -125,9 +129,10 @@ describe('performanceIndicator service', () => {
...
@@ -125,9 +129,10 @@ describe('performanceIndicator service', () => {
compareValue
:
0
,
compareValue
:
0
,
percentageVariation
:
Infinity
,
percentageVariation
:
Infinity
,
}
}
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
//Only one with no value
//Only one with no value
...
@@ -143,9 +148,10 @@ describe('performanceIndicator service', () => {
...
@@ -143,9 +148,10 @@ describe('performanceIndicator service', () => {
compareValue
:
2.61
,
compareValue
:
2.61
,
percentageVariation
:
-
1
,
percentageVariation
:
-
1
,
}
}
result
=
performanceIndicatorService
.
aggregatePerformanceIndicators
(
result
=
performanceIndicator
performanceIndicatorService
.
aggregatePerformanceIndicators
(
)
performanceIndicator
)
expect
(
result
).
toEqual
(
expectedResult
)
expect
(
result
).
toEqual
(
expectedResult
)
})
})
})
})
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment