Skip to content

Commit 5992554

Browse files
feedback changes.
1 parent 0bb37a9 commit 5992554

File tree

2 files changed

+13
-1
lines changed

2 files changed

+13
-1
lines changed

src/services/chirpstack/chirpstack-gateway.service.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -678,7 +678,7 @@ export class ChirpstackGatewayService extends GenericChirpstackConfigurationServ
678678
<p>Gateway’en ${gateway.name} er kommet online igen ${gateway.lastSeenAt.toLocaleString("da-DK", {
679679
timeZone: "Europe/Copenhagen",
680680
})}.</p>
681-
<p>Der udsendes først besked igen, når gateway’en kommer online.</p>
681+
<p>Der udsendes besked igen, hvis gateway’en går offline i det angivne tidsrum.</p>
682682
<p>Link: <a href="${this.configService.get<string>("frontend.baseurl")}/gateways/gateway-detail/${
683683
gateway.gatewayId
684684
}">${this.configService.get<string>("frontend.baseurl")}/gateways/gateway-detail/${gateway.gatewayId}</a></p>`,

src/services/data-targets/data-target.service.ts

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,14 @@ export class DataTargetService {
9090
});
9191
}
9292

93+
async findOneWithClientSecret(id: number): Promise<DataTarget> {
94+
return await this.dataTargetRepository
95+
.createQueryBuilder("dt")
96+
.addSelect("dt.clientSecret")
97+
.where('dt."id" = :id', { id: id })
98+
.getOne();
99+
}
100+
93101
public async findOneWithHasRecentError(id: number): Promise<DataTargetDto> {
94102
const datatarget = await this.findOne(id);
95103
const idsWithRecentError = await this.dataTargetLogService.getDatatargetWithRecentError([id]);
@@ -245,6 +253,10 @@ export class DataTargetService {
245253
iotDeviceId: testDto.iotDeviceId,
246254
};
247255

256+
if (dataTarget.type === DataTargetType.Fiware) {
257+
const fiwareDatatarget = await this.findOneWithClientSecret(testDto.dataTargetId);
258+
(dataTarget as FiwareDataTarget).clientSecret = (fiwareDatatarget as FiwareDataTarget).clientSecret;
259+
}
248260
const result = await this.dataTargetSenderService.sendToDataTarget(dataTarget, payloadDto);
249261
return {
250262
result,

0 commit comments

Comments
 (0)