Merge branch 'development' into 'master'

Prepare Release 3.4.4

See merge request dadangnh/iam!322

Author: hariyadip

CHANGELOG.md

@@ -1,6 +1,9 @@
 # IAM Changelog
 
-## Version 3.4.3(current stable)
+## Version 3.4.4 (current stable)
+* bug fix in endpoint whoami when get jabatanPegawai
+
+## Version 3.4.3
 * adjust payload endpoint api/pegawais/v3/info/from-iam-token
 
 ## Version 3.4.2

config/packages/api_platform.yaml

@@ -1,6 +1,6 @@
 api_platform:
     title: IAM API Docs
-    version: 3.4.3 
+    version: 3.4.4 
     description: |
         Bug report and feature request are welcome, please report [here](https://gitlab.com/dadangnh/iam/-/issues).
         Newest production version are always available at [https://iam.pajak.or.id/api](https://iam.pajak.or.id/api)

src/EventListener/SecurityEventSubscriber.php

@@ -68,8 +68,8 @@ public function onJwtCreated(JWTCreatedEvent $event): void
             /** @var JabatanPegawai $jabatanPegawai */
             foreach ($user->getPegawai()->getJabatanPegawais() as $jabatanPegawai) {
                 // Only add jabatan pegawai that is active and not expired
-                if ($jabatanPegawai->getTanggalMulai() <= new DateTimeImmutable('now')
-                    && ($jabatanPegawai->getTanggalSelesai() >= new DateTimeImmutable('now')
+                if ($jabatanPegawai->getTanggalMulai() <= new DateTimeImmutable('today')
+                    && ($jabatanPegawai->getTanggalSelesai() >= new DateTimeImmutable('today')
                         || null === $jabatanPegawai->getTanggalSelesai())
                 ) {
                     /** @var Jabatan $jabatan */
@@ -113,8 +113,8 @@ public function onJwtCreated(JWTCreatedEvent $event): void
             /** @var JabatanPegawaiLuar $jabatanPegawaiLuar */
             foreach ($user->getPegawaiLuar()->getJabatanPegawaiLuars() as $jabatanPegawaiLuar) {
                 // Only add jabatan pegawai that is active and not expired
-                if ($jabatanPegawaiLuar->getTanggalMulai() <= new DateTimeImmutable('now')
-                    && ($jabatanPegawaiLuar->getTanggalSelesai() >= new DateTimeImmutable('now')
+                if ($jabatanPegawaiLuar->getTanggalMulai() <= new DateTimeImmutable('today')
+                    && ($jabatanPegawaiLuar->getTanggalSelesai() >= new DateTimeImmutable('today')
                         || null === $jabatanPegawaiLuar->getTanggalSelesai())
                 ) {
                     /** @var JabatanLuar $jabatanLuar */