diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/LoginUserAuthConverter.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/LoginUserAuthConverter.java index fe2e3973..c9f8dfe4 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/LoginUserAuthConverter.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/converter/LoginUserAuthConverter.java @@ -1,21 +1,15 @@ package com.jasamedika.medifirst2000.converter; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Component; - import com.jasamedika.medifirst2000.converter.base.BaseVoConverter; import com.jasamedika.medifirst2000.dao.custom.base.impl.FindConverterDao; import com.jasamedika.medifirst2000.entities.KelompokUser; import com.jasamedika.medifirst2000.entities.LoginUser; -import com.jasamedika.medifirst2000.service.KelompokUserService; -import com.jasamedika.medifirst2000.service.PegawaiService; import com.jasamedika.medifirst2000.util.ExtendedSpringBeanUtil; -import com.jasamedika.medifirst2000.vo.KelompokUserVO; import com.jasamedika.medifirst2000.vo.LoginUserVO; -import com.jasamedika.medifirst2000.vo.PegawaiVO; +import org.springframework.stereotype.Component; + +import java.util.ArrayList; +import java.util.List; /** * Converter class between LoginUser and LoginUserVO @@ -23,85 +17,22 @@ import com.jasamedika.medifirst2000.vo.PegawaiVO; * @author Roberto */ @Component -public class LoginUserAuthConverter extends FindConverterDao implements - BaseVoConverter { -/* - @Override +public class LoginUserAuthConverter extends FindConverterDao implements BaseVoConverter { public LoginUser transferVOToModel(LoginUserVO vo, LoginUser model) { if (null == model) model = new LoginUser(); - - try { - String[] fieldsToInclude = null; - Map serialized = vo.serialize(fieldsToInclude,vo.getClass().getName()); - Gson gson = new Gson(); - String json = gson.toJson(serialized); - model = gson.fromJson(json, LoginUser.class); - } catch (Exception e) { - e.printStackTrace(); - } - - return model; - } - - @Override - public List transferListOfModelToListOfVO(List models, List vos) { - if (null == vos) - vos = new ArrayList(); - - if (null == models) - return vos; - - for (LoginUser loginUser : models) { - LoginUserVO vo = new LoginUserVO(); - vo=transferModelToVO(loginUser, vo); - vos.add(vo); - } - - return vos; - } - - @Override - public LoginUserVO transferModelToVO(LoginUser model, LoginUserVO vo) { - if (null == vo) - vo = new LoginUserVO(); - try { - String[] fieldsToInclude = null; - Map serialized = model.serialize(fieldsToInclude,model.getClass().getSimpleName()); - Gson gson = new Gson(); - - String json = gson.toJson(serialized); - vo = gson.fromJson(json, LoginUserVO.class); - } catch (Exception e) { - e.printStackTrace(); - } - - return vo; - } - */ - - public LoginUser transferVOToModel(LoginUserVO vo, LoginUser model) { - if (null == model) - model = new LoginUser(); - - // fix this - ExtendedSpringBeanUtil.copySpecificProperties(vo, model, new String[] { - "id", "kataSandi", "namaUser", }, new String[] { "id", - "kataSandi", "namaUser", }); + ExtendedSpringBeanUtil.copySpecificProperties(vo, model, new String[] { "id", "kataSandi", "namaUser", }, + new String[] { "id", "kataSandi", "namaUser", }); if (vo.getKelompokUser() != null) { - KelompokUser kelompokUser = (KelompokUser) findObjectById( - KelompokUser.class, vo.getKelompokUser().getId()); + KelompokUser kelompokUser = (KelompokUser) findObjectById(KelompokUser.class, vo.getKelompokUser().getId()); model.setKelompokUser(kelompokUser); } return model; - } - public List transferListOfModelToListOfVO( - List models, List vos) { + public List transferListOfModelToListOfVO(List models, List vos) { if (null == vos) - vos = new ArrayList(); - + vos = new ArrayList<>(); if (null == models) return vos; @@ -110,35 +41,14 @@ public class LoginUserAuthConverter extends FindConverterDao implements transferModelToVO(loginUser, loginUserVO); vos.add(loginUserVO); } - return vos; } public LoginUserVO transferModelToVO(LoginUser model, LoginUserVO vo) { if (null == vo) - vo = new LoginUserVO(); - - // fix this - ExtendedSpringBeanUtil.copySpecificProperties(model, vo, new String[] { - "id", "kataSandi", "namaUser", }, new String[] { "id", - "kataSandi", "namaUser", }); - - if (model.getKelompokUser() != null) { - KelompokUserVO kelompokUserVo = kelompokUserService.findById(model - .getKelompokUser().getId()); - vo.setKelompokUser(kelompokUserVo); - } - if (model.getPegawai() != null) { - PegawaiVO kelompokUserVo = pgawaiService.findById(model - .getPegawai().getId()); - vo.setPegawai(kelompokUserVo); - } + ExtendedSpringBeanUtil.copySpecificProperties(model, vo, new String[] { "id", "kataSandi", "namaUser", }, + new String[] { "id", "kataSandi", "namaUser", }); return vo; } - - @Autowired - private KelompokUserService kelompokUserService; - @Autowired - private PegawaiService pgawaiService; } diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ActivityPegawaiServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ActivityPegawaiServiceImpl.java index 33478436..d1ba4501 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ActivityPegawaiServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/ActivityPegawaiServiceImpl.java @@ -96,7 +96,6 @@ public class ActivityPegawaiServiceImpl implements ActivityPegawaiService { act.setTanggalKejadian(new Date()); act = activityPegawaiDao.save(act); act = activityPegawaiDao.findOne(act.getNoRec()); - act.setPegawai(pegawaiDao.findById(pegawai.getId())); try { BroadcastMessage("IKI", act.ToMap()); } catch (IllegalArgumentException | IllegalAccessException e) { diff --git a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LoginUserServiceImpl.java b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LoginUserServiceImpl.java index c6c3b813..8605097c 100644 --- a/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LoginUserServiceImpl.java +++ b/jasamedika-business/src/main/java/com/jasamedika/medifirst2000/service/impl/LoginUserServiceImpl.java @@ -2,7 +2,6 @@ package com.jasamedika.medifirst2000.service.impl; import com.jasamedika.medifirst2000.converter.BaseConverterImpl; import com.jasamedika.medifirst2000.converter.LoginUserAuthConverter; -import com.jasamedika.medifirst2000.converter.LoginUserConverter; import com.jasamedika.medifirst2000.dao.HistoryLoginModulAplikasiDao; import com.jasamedika.medifirst2000.dao.LoginUserDao; import com.jasamedika.medifirst2000.dao.MapPegawaiToModulAplikasiDao; @@ -30,7 +29,6 @@ import java.util.*; @Service("LoginUserService") public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUserService { - private static final Logger LOGGER = LoggerFactory.getLogger(LoginUserServiceImpl.class); @Autowired @@ -43,10 +41,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser private LoginUserAuthConverter loginUserAuthConverter; @Autowired - private LoginUserConverter loginUserConverter; - - @Autowired - private BaseConverterImpl loginUserConverters; + private BaseConverterImpl loginUserConverter; @Autowired private BaseConverterImpl pegawaiConverter; @@ -103,7 +98,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser } @Override - @Transactional(readOnly = false) + @Transactional public LoginUserVO add(LoginUserVO vo) throws JpaSystemException, ServiceVOException { // convert to model and call repository LoginUser loginUser = new LoginUser(); @@ -113,7 +108,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser try { loginUser.setKataSandi(passwordUtil.encryptPassword(loginUser.getKataSandi())); } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } LoginUser resultModel = loginUserDao.save(loginUser); @@ -126,7 +121,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser } @Override - @Transactional(readOnly = false) + @Transactional public LoginUserVO update(LoginUserVO vo) throws JpaSystemException, ServiceVOException { // Alter Syamsu @@ -139,7 +134,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser try { loginUserLama.setKataSandi(passwordUtil.encryptPassword(loginUserLama.getKataSandi())); } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } loginUserDao.save(loginUserLama); @@ -152,7 +147,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser } @Override - @Transactional(readOnly = false) + @Transactional public Boolean delete(Integer key) throws JpaSystemException { if (loginUserDao.exists(key)) { loginUserDao.delete(key); @@ -180,7 +175,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser List loginUserList = IteratorUtils.toList(loginUserDao.findAll().iterator()); - List loginUserVOList = new ArrayList(); + List loginUserVOList = new ArrayList<>(); loginUserConverter.transferListOfModelToListOfVO(loginUserList, loginUserVOList); return loginUserVOList; @@ -202,7 +197,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser LoginUser loginUser = loginUsers.get(0); PasswordUtil passwordUtil = new PasswordUtil(); - Boolean isValidPassword = false; + boolean isValidPassword; try { isValidPassword = passwordUtil.isPasswordEqual(authVO.getKataSandi(), loginUser.getKataSandi()); } catch (IOException ioe) { @@ -214,11 +209,19 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser return null; } // to do validasi yang advanced di sini - LoginUserVO vo = new LoginUserVO(); - loginUserAuthConverter.transferModelToVO(loginUser, vo); + vo = loginUserAuthConverter.transferModelToVO(loginUser, vo); + if (CommonUtil.isNotNullOrEmpty(loginUser.getKelompokUser())) { + KelompokUserVO kelompokUserVO = new KelompokUserVO(); + kelompokUserVO = kelompokUserConverter.transferModelToVO(loginUser.getKelompokUser(), kelompokUserVO); + vo.setKelompokUser(kelompokUserVO); + } + if (CommonUtil.isNotNullOrEmpty(loginUser.getPegawai())) { + PegawaiVO pegawaiVO = new PegawaiVO(); + pegawaiVO = pegawaiConverter.transferModelToVO(loginUser.getPegawai(), pegawaiVO); + vo.setPegawai(pegawaiVO); + } return vo; - } else { throw new RuntimeException("User account is unauthorized : username : " + authVO.getNamaUser()); } @@ -226,22 +229,20 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser @Override public LoginUser getLoginUser() { - List loginUser = null; try { Object principal = SecurityContextHolder.getContext().getAuthentication().getPrincipal(); String namaUser = principal.toString(); - loginUser = loginUserDao.findByNamaUser(namaUser); + List loginUser = loginUserDao.findByNamaUser(namaUser); + return loginUser.get(0); } catch (Exception e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } - return loginUser.get(0); } @Override public Map getAllUser() { - Map result = new HashMap(); - List list = new ArrayList(); - list = (List) loginUserDao.findAllUser(); + Map result = new HashMap<>(); + List list = loginUserDao.findAllUser(); if (CommonUtil.isNotNullOrEmpty(list)) { result.put("data", list); result.put("dataFound", true); @@ -251,12 +252,9 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser return result; } - // Reza - // ----------------------------------------------------------------------------------------------- - @Override public Map getLoadData() { - Map result = new HashMap(); + Map result = new HashMap<>(); // -------------------------------------------------------------------------- List> listPegawai = loginUserDao.listPegawai(); if (CommonUtil.isNotNullOrEmpty(listPegawai)) { @@ -348,7 +346,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser } } } catch (Exception ex) { - ex.printStackTrace(); + throw new ServiceVOException(ex.getMessage()); } return listSideMenu; } @@ -366,7 +364,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser LoginUser loginUser = new LoginUser(); if (CommonUtil.isNotNullOrEmpty(vo)) { - loginUser = loginUserConverters.transferVOToModel(vo, new LoginUser()); + loginUser = loginUserConverter.transferVOToModel(vo, new LoginUser()); loginUser.setKdProfile((short) 0); loginUser.setStatusEnabled(true); loginUser.setKodeExternal(""); @@ -381,7 +379,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser try { loginUser.setKataSandi(new PasswordUtil().encryptPassword(vo.getKataSandi())); } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) { @@ -441,9 +439,8 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser public Map getListRuangan(Integer loginUserId) { Map result = new HashMap<>(); List> listRuangan = loginUserDao.getListRuangan(loginUserId); - if (CommonUtil.isNotNullOrEmpty(listRuangan)) { + if (CommonUtil.isNotNullOrEmpty(listRuangan)) result.put("listRuangan", listRuangan); - } return result; } @@ -451,62 +448,22 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser public Map getListModulAplikasi(Integer pegawaiId) { Map result = new HashMap<>(); List> listModulAplikasi = loginUserDao.getListModulAplikasi(pegawaiId); - if (CommonUtil.isNotNullOrEmpty(listModulAplikasi)) { + if (CommonUtil.isNotNullOrEmpty(listModulAplikasi)) result.put("listModulAplikasi", listModulAplikasi); - } return result; } @Override public List> getListObjectModulAplikasi(Integer modulAplikasiId) { - List> result = new ArrayList<>(); - // for(Map objectModulHead : - // loginUserDao.getObjectModulHeadByModul(modulAplikasiId)){ - // Map parent = new HashMap<>(); - // - // if(CommonUtil.isNotNullOrEmpty(objectModulHead)){ - // parent.put("name", objectModulHead.get("objekModulAplikasi")); - // parent.put("noUrut", objectModulHead.get("objekModulNoUrut")); - // - // List> listObjectModul = - // loginUserDao.getModulByModulHead((Integer)objectModulHead.get("id")); - // if(CommonUtil.isNullOrEmpty(listObjectModul)){ - // parent.put("link", objectModulHead.get("alamatUrlForm")); - // } - // - // List> listChildren = new ArrayList<>(); - // for(Map objectModul: listObjectModul){ - // Map children = new HashMap<>(); - // - // if(CommonUtil.isNotNullOrEmpty(objectModul)){ - // children.put("name", objectModul.get("objekModulAplikasi")); - // children.put("link", objectModul.get("alamatUrlForm")); - // children.put("noUrut", objectModul.get("objekModulNoUrut")); - // } - // if(CommonUtil.isNotNullOrEmpty(children)){ - // listChildren.add(children); - // } - // } - // if(CommonUtil.isNotNullOrEmpty(listChildren)){ - // parent.put("children", listChildren); - // } - // } - // if(CommonUtil.isNotNullOrEmpty(parent)){ - // result.add(parent); - // } - // } - return result; + return new ArrayList<>(); } @Override public Map saveUpdateLoginUser(LoginUserVO vo) { Map result = new HashMap<>(); - if (CommonUtil.isNotNullOrEmpty(vo)) { - LoginUser loginUser = new LoginUser(); - if (CommonUtil.isNotNullOrEmpty(vo.getId())) { - loginUser = setLoginUser(vo); + LoginUser loginUser = setLoginUser(vo); if (CommonUtil.isNotNullOrEmpty(loginUser)) { LoginUser loginUserResult = loginUserDao.save(loginUser); result.put("namaUser", loginUserResult.getNamaUser()); @@ -518,7 +475,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser if (CommonUtil.isNotNullOrEmpty(users)) { result.put("statusError", "Nama user sudah ada, silahkan input nama user lainya"); } else { - loginUser = setLoginUser(vo); + LoginUser loginUser = setLoginUser(vo); if (CommonUtil.isNotNullOrEmpty(loginUser)) { LoginUser loginUserResult = loginUserDao.save(loginUser); result.put("namaUser", loginUserResult.getNamaUser()); @@ -557,7 +514,7 @@ public class LoginUserServiceImpl extends BaseVoServiceImpl implements LoginUser try { loginUser.setKataSandi(new PasswordUtil().encryptPassword(vo.getKataSandi())); } catch (NoSuchAlgorithmException | UnsupportedEncodingException e) { - e.printStackTrace(); + throw new ServiceVOException(e.getMessage()); } } if (CommonUtil.isNotNullOrEmpty(vo.getPegawai())) {