Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Mail user on TransactionStop and SuspendedEV event #1263

Open
wants to merge 50 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
50 commits
Select commit Hold shift + click to select a range
0005fa7
StringUtils: add method to check mail address
Aug 2, 2023
4cbea6f
UserRepository: add method "User.Details getDetails(String ocppTag)"
Aug 2, 2023
75fd4fa
TransactionRepository: add method "Transaction getTransaction(int tra…
Aug 2, 2023
e254786
MailService: change method "send(String subject, String body)" to "se…
Aug 2, 2023
4eadaa8
NotificationService: in method "ocppTransactionEnded(OcppTransactionE…
Aug 2, 2023
dd6fc78
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Aug 2, 2023
1b366b4
OcppStationStatusSuspendedEV.java added
Aug 2, 2023
e38a108
NotificationFeature.java: added NotificationFeature "OcppStationStatu…
Aug 2, 2023
f51a3da
CentralSystemService16_Service.java: on a statusNotification, added p…
Aug 2, 2023
df0b5c4
OcppServerRepository: add method getConnectorPK
Aug 2, 2023
7f73ecd
TransactionRepository: add method getOcppTagOfActiveTransaction(integ…
Aug 2, 2023
4ca23a6
NotificationService: added Event ocppStationStatusSuspendedEV(OcppSta…
Aug 2, 2023
64707ee
NotificationService & CentralSystemService16_Service: Format and Comm…
Aug 4, 2023
00853ff
NotificationService: added mail to "admin" in OcppStationStatusSuspen…
Aug 5, 2023
bf113ab
NotificationService: formated mail text in OcppStationStatusSuspended…
Aug 5, 2023
4392296
NotificationService.java & OcppStationStatusSuspend: commeting and fo…
Oct 12, 2023
fac303d
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Oct 12, 2023
ee0e608
Merge origin/MailUserAtTransactionStop into MailUserAtTransactionStop
Oct 12, 2023
8e44e38
style correction
Oct 12, 2023
472b75d
style correction
Oct 17, 2023
a38d588
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Nov 28, 2023
d1f586d
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Dec 13, 2023
416c838
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Dec 23, 2023
953abb4
TransactionRepositoryImpl, method getOcppTagOfActiveTransaction: orde…
Dec 23, 2023
48d7a68
NotificationService, SuspendedEV & TransactionStop: catch exception i…
Dec 23, 2023
6a2a702
Removed unnecessary code
Dec 25, 2023
eb64190
NotificationService: shorten the error log message (no stack info)
Dec 25, 2023
102ea16
BeanConfiguration: add @EnableAsync to activate @Async in Notificatio…
Dec 25, 2023
1798ba9
BeanConfiguration: removed @EnableAsync because it's notcompiling und…
Dec 26, 2023
14ac662
NotificationService: removing @Async annotations. Realizing async ins…
Dec 26, 2023
817bc5d
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Jan 15, 2024
6a9091c
OcppServerRepository remove method getConnectorPk
Jan 23, 2024
3d26aa2
TransactionRepository: add method getActiveTransactionId(String chage…
Jan 23, 2024
4c66f00
add timestamp to SUSPENDED_EV notification
Jan 23, 2024
4d2963a
adapt methode notificationActionSuspendedEV -> removed ocppServerRepo…
Jan 23, 2024
230c1ee
getActiveTransactionId(String chargeBox, Integer connectorId) method,…
Jan 23, 2024
a1d5ce1
Merge origin/MailUserAtTransactionStop into MailUserAtTransactionStop
Jan 23, 2024
f7919f7
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Feb 1, 2024
2c46260
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Feb 6, 2024
0563e46
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Feb 19, 2024
26442d3
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Mar 28, 2024
f61a428
Merge branch 'master' into MailUserAtTransactionStop
fnkbsi Apr 3, 2024
9faa7b4
Restore @override annotation after reslove conflict
fnkbsi Apr 3, 2024
a85bbef
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Apr 19, 2024
199b45c
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi May 13, 2024
f5edb5d
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Jun 19, 2024
22ba398
Merge branch 'steve-community:master' into MailUserAtTransactionStop
fnkbsi Aug 8, 2024
b2c6908
Adding user individual notification selection. Selection is stored in…
fnkbsi Aug 8, 2024
ac38d1e
Rename db migration script V1_06 to V1_08
fnkbsi Oct 10, 2024
b015a57
Merge origin/master into MailUserAtTransactionStop
fnkbsi Oct 10, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
TransactionRepository: add method getOcppTagOfActiveTransaction(integ…
…er connectorPK)
  • Loading branch information
fnkbsi authored and fnkbsi committed Aug 2, 2023
commit 7f73ecdb4056a859e2418a0295e313d2bbb48237
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,8 @@ public interface TransactionRepository {

List<Integer> getActiveTransactionIds(String chargeBoxId);

String getOcppTagOfActiveTransaction(Integer connectorPk);

TransactionDetails getDetails(int transactionPk, boolean firstArrivingMeterValueIfMultiple);

default TransactionDetails getDetails(int transactionPk) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,6 +98,15 @@ public List<Integer> getActiveTransactionIds(String chargeBoxId) {
.fetch(TRANSACTION.TRANSACTION_PK);
}

@Override
public String getOcppTagOfActiveTransaction(Integer connectorPk) {
return ctx.select(TRANSACTION.ID_TAG)
.from(TRANSACTION)
.where(TRANSACTION.CONNECTOR_PK.eq(connectorPk))
.and(TRANSACTION.STOP_VALUE.isNull())
.fetchAny(TRANSACTION.ID_TAG);
}

@Override
public TransactionDetails getDetails(int transactionPk, boolean firstArrivingMeterValueIfMultiple) {

Expand Down