diff --git a/rumahSehat/src/main/java/apap/tk/rumahSehat/controller/AppointmentController.java b/rumahSehat/src/main/java/apap/tk/rumahSehat/controller/AppointmentController.java
index 1fd8d228920e6ea6c2c57e12023b196b69f8778f..f3bd7950f3a15c409175a9c1db1a66a48b07dc3a 100644
--- a/rumahSehat/src/main/java/apap/tk/rumahSehat/controller/AppointmentController.java
+++ b/rumahSehat/src/main/java/apap/tk/rumahSehat/controller/AppointmentController.java
@@ -17,6 +17,7 @@ import java.util.List;
@Controller
public class AppointmentController {
+ private static final String LIST_APPOINTMENT = "listAppointment";
@Qualifier("appointmentServiceImpl")
@Autowired
@@ -34,9 +35,10 @@ public class AppointmentController {
var auth = SecurityContextHolder.getContext().getAuthentication();
String username = auth.getName();
+
if (hasRole(auth, "ROLE_ADMIN")) {
model.addAttribute("role", "ROLE_ADMIN");
- model.addAttribute("listAppointment", listAppointment);
+ model.addAttribute(LIST_APPOINTMENT, listAppointment);
}
else if (hasRole(auth, "ROLE_PASIEN")) {
List<AppointmentModel> listAppointmentbaru = new ArrayList<>();
@@ -47,7 +49,7 @@ public class AppointmentController {
listAppointmentbaru.add(appointment);
}
}
- model.addAttribute("listAppointment", listAppointmentbaru);
+ model.addAttribute(LIST_APPOINTMENT, listAppointmentbaru);
}
else if (hasRole(auth, "ROLE_DOKTER")) {
List<AppointmentModel> listAppointmentbaru = new ArrayList<>();
@@ -58,7 +60,7 @@ public class AppointmentController {
listAppointmentbaru.add(appointment);
}
}
- model.addAttribute("listAppointment", listAppointmentbaru);
+ model.addAttribute(LIST_APPOINTMENT, listAppointmentbaru);
}
return "viewall-appointment";
}
diff --git a/rumahSehat/src/main/java/apap/tk/rumahSehat/service/UserService.java b/rumahSehat/src/main/java/apap/tk/rumahSehat/service/UserService.java
index a9edcd62b0535b04f6414b3ddba875e820c91ca9..7b9b5c480caccad42cfc60930f4a81a333846123 100644
--- a/rumahSehat/src/main/java/apap/tk/rumahSehat/service/UserService.java
+++ b/rumahSehat/src/main/java/apap/tk/rumahSehat/service/UserService.java
@@ -2,7 +2,6 @@ package apap.tk.rumahSehat.service;
import apap.tk.rumahSehat.model.*;
import apap.tk.rumahSehat.repository.*;
-import apap.tk.rumahSehat.security.xml.Attributes;
import apap.tk.rumahSehat.security.xml.ServiceResponse;
import apap.tk.rumahSehat.setting.Setting;
import apap.tk.rumahSehat.model.AdminModel;
@@ -21,7 +20,6 @@ import apap.tk.rumahSehat.repository.UserDb;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
-import org.springframework.security.core.context.SecurityContext;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
import org.springframework.security.web.context.HttpSessionSecurityContextRepository;
@@ -29,12 +27,24 @@ import org.springframework.stereotype.Service;
import org.springframework.web.reactive.function.client.WebClient;
import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
import java.time.LocalDateTime;
import java.util.ArrayList;
@Service
public class UserService {
+ private final static String ADMIN = "admin";
+ private final static String DOKTER = "dokter";
+ private final static String PASIEN = "pasien";
+ private final static String APOTEKER = "apoteker";
+ private final static String DAVID = "David";
+ private final static String JOHAN = "Johan";
+ private final static String HILMY = "Hilmy";
+ private final static String DION = "Dion";
+ private final static String FAREL = "Farel";
+ private final static String CICI = "Cici";
+ private final static String HANI = "Hani";
+ private final static String GREG = "Greg";
+
@Autowired
PasienDb pasienDb;
@Autowired
@@ -99,38 +109,38 @@ public class UserService {
public void addDummy(){
var admin = new AdminModel();
- admin.setEmail("admin");
- admin.setNama("admin");
- admin.setPassword(encrypt("admin"));
+ admin.setEmail(ADMIN);
+ admin.setNama(ADMIN);
+ admin.setPassword(encrypt(ADMIN));
admin.setRole(EnumRole.ADMIN);
- admin.setUsername("admin");
+ admin.setUsername(ADMIN);
adminDb.save(admin);
var dokter = new DokterModel();
- dokter.setEmail("dokter");
- dokter.setNama("dokter");
- dokter.setPassword(encrypt("dokter"));
+ dokter.setEmail(DOKTER);
+ dokter.setNama(DOKTER);
+ dokter.setPassword(encrypt(DOKTER));
dokter.setRole(EnumRole.DOKTER);
dokter.setTarif(200000);
- dokter.setUsername("dokter");
+ dokter.setUsername(DOKTER);
dokterDb.save(dokter);
var pasien = new PasienModel();
- pasien.setEmail("pasien");
- pasien.setNama("pasien");
- pasien.setPassword(encrypt("pasien"));
+ pasien.setEmail(PASIEN);
+ pasien.setNama(PASIEN);
+ pasien.setPassword(encrypt(PASIEN));
pasien.setRole(EnumRole.PASIEN);
pasien.setSaldo(200000);
pasien.setUmur(20);
- pasien.setUsername("pasien");
+ pasien.setUsername(PASIEN);
pasienDb.save(pasien);
var apoteker = new ApotekerModel();
- apoteker.setEmail("apoteker");
- apoteker.setNama("apoteker");
- apoteker.setPassword(encrypt("apoteker"));
+ apoteker.setEmail(APOTEKER);
+ apoteker.setNama(APOTEKER);
+ apoteker.setPassword(encrypt(APOTEKER));
apoteker.setRole(EnumRole.APOTEKER);
- apoteker.setUsername("apoteker");
+ apoteker.setUsername(APOTEKER);
apotekerDb.save(apoteker);
}
@@ -146,77 +156,77 @@ public class UserService {
}
public void addDummyForChart(){
- DokterModel dokterDavid = new DokterModel();
+ var dokterDavid = new DokterModel();
dokterDavid.setEmail("david@johan.com");
- dokterDavid.setNama("David");
- dokterDavid.setPassword(encrypt("David"));
+ dokterDavid.setNama(DAVID);
+ dokterDavid.setPassword(encrypt(DAVID));
dokterDavid.setRole(EnumRole.DOKTER);
dokterDavid.setTarif(2000000);
- dokterDavid.setUsername("David");
+ dokterDavid.setUsername(DAVID);
dokterDb.save(dokterDavid);
- DokterModel dokterJohan = new DokterModel();
+ var dokterJohan = new DokterModel();
dokterJohan.setEmail("Johan@david.com");
- dokterJohan.setNama("Johan");
- dokterJohan.setPassword(encrypt("Johan"));
+ dokterJohan.setNama(JOHAN);
+ dokterJohan.setPassword(encrypt(JOHAN));
dokterJohan.setRole(EnumRole.DOKTER);
dokterJohan.setTarif(350000);
- dokterJohan.setUsername("Johan");
+ dokterJohan.setUsername(JOHAN);
dokterDb.save(dokterJohan);
- DokterModel dokterDion = new DokterModel();
+ var dokterDion = new DokterModel();
dokterDion.setEmail("dion@dion.com");
- dokterDion.setNama("Dion");
- dokterDion.setPassword(encrypt("Dion"));
+ dokterDion.setNama(DION);
+ dokterDion.setPassword(encrypt(DION));
dokterDion.setRole(EnumRole.DOKTER);
dokterDion.setTarif(1000000);
- dokterDion.setUsername("Dion");
+ dokterDion.setUsername(DION);
dokterDb.save(dokterDion);
- DokterModel dokterGreg = new DokterModel();
+ var dokterGreg = new DokterModel();
dokterGreg.setEmail("Greg@Greg.com");
- dokterGreg.setNama("Greg");
- dokterGreg.setPassword(encrypt("Greg"));
+ dokterGreg.setNama(GREG);
+ dokterGreg.setPassword(encrypt(GREG));
dokterGreg.setRole(EnumRole.DOKTER);
dokterGreg.setTarif(500000);
- dokterGreg.setUsername("Greg");
+ dokterGreg.setUsername(GREG);
dokterDb.save(dokterGreg);
- DokterModel dokterHilmy = new DokterModel();
+ var dokterHilmy = new DokterModel();
dokterHilmy.setEmail("Hilmy@Hilmy.com");
- dokterHilmy.setNama("Hilmy");
- dokterHilmy.setPassword(encrypt("Hilmy"));
+ dokterHilmy.setNama(HILMY);
+ dokterHilmy.setPassword(encrypt(HILMY));
dokterHilmy.setRole(EnumRole.DOKTER);
dokterHilmy.setTarif(1200000);
- dokterHilmy.setUsername("Hilmy");
+ dokterHilmy.setUsername(HILMY);
dokterDb.save(dokterHilmy);
- ApotekerModel apotekerFarel = new ApotekerModel();
+ var apotekerFarel = new ApotekerModel();
apotekerFarel.setEmail("Farel@greg.com");
- apotekerFarel.setNama("Farel");
- apotekerFarel.setPassword(encrypt("Farel"));
+ apotekerFarel.setNama(FAREL);
+ apotekerFarel.setPassword(encrypt(FAREL));
apotekerFarel.setRole(EnumRole.APOTEKER);
- apotekerFarel.setUsername("Farel");
+ apotekerFarel.setUsername(FAREL);
apotekerDb.save(apotekerFarel);
- PasienModel pasienCici = new PasienModel();
+ var pasienCici = new PasienModel();
pasienCici.setEmail("Cici@cici.com");
pasienCici.setNama("Cici@cici.com");
- pasienCici.setPassword(encrypt("Cici"));
+ pasienCici.setPassword(encrypt(CICI));
pasienCici.setRole(EnumRole.PASIEN);
pasienCici.setSaldo(10000);
pasienCici.setUmur(20);
- pasienCici.setUsername("Cici");
+ pasienCici.setUsername(CICI);
pasienDb.save(pasienCici);
- PasienModel pasienHani = new PasienModel();
+ var pasienHani = new PasienModel();
pasienHani.setEmail("Hani@hani.com");
- pasienHani.setNama("Hani");
- pasienHani.setPassword(encrypt("Hani"));
+ pasienHani.setNama(HANI);
+ pasienHani.setPassword(encrypt(HANI));
pasienHani.setRole(EnumRole.PASIEN);
pasienHani.setSaldo(10000);
pasienHani.setUmur(20);
- pasienHani.setUsername("Hani");
+ pasienHani.setUsername(HANI);
pasienDb.save(pasienHani);
//Appointment Dokter David
@@ -225,17 +235,17 @@ public class UserService {
}
//Appointment Dokter Dion
- for (int i = 1; i <= 12; i=i+2) {
+ for (var i = 1; i <= 12; i=i+2) {
dummyApptDone(dokterDion,apotekerFarel,pasienHani,i,4);
}
//Appointment Dokter Johan
- for (int i = 2; i <= 12; i=i+2) {
+ for (var i = 2; i <= 12; i=i+2) {
dummyApptDone(dokterJohan,apotekerFarel,pasienCici,i,10+i);
}
//Appointment Dokter Greg
- for (int i = 3; i <= 12; i=i+3) {
+ for (var i = 3; i <= 12; i=i+3) {
dummyApptDone(dokterGreg,apotekerFarel,pasienCici,i,2+i);
if (i%2 == 1){
dummyApptDone(dokterGreg,apotekerFarel,pasienHani,i,8);
@@ -244,7 +254,7 @@ public class UserService {
}
//Appointment Dokter Hilmy
- for (int i = 1; i <= 12; i++) {
+ for (var i = 1; i <= 12; i++) {
dummyApptDone(dokterHilmy,apotekerFarel,pasienHani,i,24);
if (i%2 == 0){
dummyApptDone(dokterHilmy,apotekerFarel,pasienCici,i,7);
@@ -255,14 +265,14 @@ public class UserService {
}
private void dummyApptDone(DokterModel dokter,ApotekerModel apoteker, PasienModel pasien, int bulan, int tanggal){
- AppointmentModel apptDone = new AppointmentModel();
+ var apptDone = new AppointmentModel();
apptDone.setWaktuAwal(LocalDateTime.of(2022,bulan,tanggal,10,0));
apptDone.setIsDone(true);
apptDone.setPasien(pasien);
apptDone.setDokter(dokter);
appointmentDb.save(apptDone);
- ResepModel resepApptDone = new ResepModel();
+ var resepApptDone = new ResepModel();
resepApptDone.setIsDone(true);
resepApptDone.setCreatedAt(LocalDateTime.of(2022,bulan,tanggal,10,0));
resepApptDone.setConfirmerUuid(apoteker);
@@ -270,7 +280,7 @@ public class UserService {
resepApptDone.setListJumlah(new ArrayList<>());
resepDb.save(resepApptDone);
- TagihanModel tagihanApptDone = new TagihanModel();
+ var tagihanApptDone = new TagihanModel();
tagihanApptDone.setTanggalTerbuat(LocalDateTime.of(2022,bulan,tanggal,10,0));
tagihanApptDone.setTanggalBayar(LocalDateTime.of(2022,bulan,tanggal,12,0));
tagihanApptDone.setIsPaid(true);
diff --git a/rumahSehat/src/main/java/apap/tk/rumahSehat/setting/Setting.java b/rumahSehat/src/main/java/apap/tk/rumahSehat/setting/Setting.java
index 5d25e98b296ee0d3bb0dc4848516da389491dad7..b4e707d99c808f0d16767247d227e684b222edf5 100644
--- a/rumahSehat/src/main/java/apap/tk/rumahSehat/setting/Setting.java
+++ b/rumahSehat/src/main/java/apap/tk/rumahSehat/setting/Setting.java
@@ -1,7 +1,6 @@
package apap.tk.rumahSehat.setting;
public class Setting {
-// final public static String CLIENT_BASE_URL = "http://localhost:8080";
public static final String CLIENT_BASE_URL = "https://apap-100.cs.ui.ac.id";
@@ -12,4 +11,6 @@ public class Setting {
public static final String SERVER_LOGIN = SERVER_BASE_URL + "/login?service=";
public static final String SERVER_LOGOUT = SERVER_BASE_URL + "/logout?url=";
public static final String SERVER_VALIDATE_TICKET = SERVER_BASE_URL + "/serviceValidate?ticket=%s&service=%s";
+
+ private Setting(){}
}