103. EPMO Open Source Coordination Office Redaction File Detail Report

Produced by Araxis Merge on 12/20/2017 5:56:12 PM Eastern Standard Time. See www.araxis.com for information about Merge. This report uses XHTML and CSS2, and is best viewed with a modern standards-compliant browser. For optimum results when printing this report, use landscape orientation and enable printing of background images and colours in your browser.

103.1 Files compared

# Location File Last Modified
1 Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\converter StudyApprovalConverter.java Thu Dec 14 19:57:07 2017 UTC
2 Genisis_2.0_v6_bld6.zip\Source Code\UI\Services\src\main\java\gov\va\genisis2\converter StudyApprovalConverter.java Wed Dec 20 22:09:47 2017 UTC

103.2 Comparison summary

Description Between
Files 1 and 2
Text Blocks Lines
Unchanged 2 306
Changed 1 2
Inserted 0 0
Removed 0 0

103.3 Comparison options

Whitespace
Character case Differences in character case are significant
Line endings Differences in line endings (CR and LF characters) are ignored
CR/LF characters Not shown in the comparison detail

103.4 Active regular expressions

No regular expressions were active.

103.5 Comparison detail

  1   package go v.va.genis is2.conver ter;
  2  
  3   import jav a.util.Arr ayList;
  4   import jav a.util.Lis t;
  5  
  6   import org .apache.co mmons.lang 3.StringUt ils;
  7   import org .springfra mework.cor e.convert. converter. Converter;
  8   import org .springfra mework.ste reotype.Co mponent;
  9  
  10   import gov .va.genisi s2.common. enums.User StatusEnum ;
  11   import gov .va.genisi s2.dto.Stu dyApproval DTO;
  12   import gov .va.genisi s2.model.S tudyApprov al;
  13   import gov .va.genisi s2.model.U ser;
  14   import gov .va.genisi s2.util.Da teUtil;
  15   import gov .va.genisi s2.vo.Ldap StudyAppro val;
  16   import gov .va.genisi s2.vo.Ldap User;
  17  
  18   /**
  19    * This cl ass is use d to conve rt StudyAp provalDTO  to StudyAp proval ent ity and vi ce-versa.
  20    * 
  21    * @author  P II
  22    *
  23    */
  24   @Component
  25   public cla ss StudyAp provalConv erter impl ements Con verter<Stu dyApproval , StudyApp rovalDTO>  {
  26  
  27           @O verride
  28           pu blic Study ApprovalDT O convert( StudyAppro val studyA pproval) {
  29                    Stud yApprovalD TO studyAp provalDTO  = new Stud yApprovalD TO();
  30  
  31                    stud yApprovalD TO.setId(s tudyApprov al.getId() );
  32                    stud yApprovalD TO.setProc essId(stud yApproval. getProcess Id());
  33                    stud yApprovalD TO.setObta ined(study Approval.g etApproval IdObtained ());
  34                    stud yApprovalD TO.setTitl e(studyApp roval.getT itle());
  35                    stud yApprovalD TO.setDesc ription(st udyApprova l.getDescr iption());
  36                    stud yApprovalD TO.setCrea tedOn(stud yApproval. getCreated On());
  37                    stud yApprovalD TO.setModi fiedOn(stu dyApproval .getModifi edOn());
  38                    stud yApprovalD TO.setCrea tedBy(stud yApproval. getCreated By());
  39                    stud yApprovalD TO.setModi fiedBy(stu dyApproval .getModifi edBy());
  40  
  41                    List <Integer>  associated StudyAppro vals = new  ArrayList <>();
  42                    if ( studyAppro val.getAss ociatedStu dyApproval 1() != nul l) {
  43                             associ atedStudyA pprovals.a dd(studyAp proval.get Associated StudyAppro val1());
  44                    }
  45                    
  46                    if ( studyAppro val.getAss ociatedStu dyApproval 2() != nul l) {
  47                             associ atedStudyA pprovals.a dd(studyAp proval.get Associated StudyAppro val2());
  48                    }
  49                    
  50                    if ( studyAppro val.getAss ociatedStu dyApproval 3() != nul l) {
  51                             associ atedStudyA pprovals.a dd(studyAp proval.get Associated StudyAppro val3());
  52                    }
  53                    if ( !associate dStudyAppr ovals.isEm pty()) {
  54                             studyA pprovalDTO .setAssoci atedApprov als(associ atedStudyA pprovals);
  55                    }
  56                    stud yApprovalD TO.setActi ve(studyAp proval.get Active());
  57                    stud yApprovalD TO.setActi veDate(stu dyApproval .getActive Date());
  58                    stud yApprovalD TO.setInac tiveDate(s tudyApprov al.getInac tiveDate() );
  59  
  60                    retu rn studyAp provalDTO;
  61           }
  62           
  63           pu blic List< StudyAppro valDTO> co nvertStudy Approvals( List<Study Approval>  studyAppro vals) {
  64                    List <StudyAppr ovalDTO> s tudyApprov alDTOs = n ull;
  65                    
  66                    if ( null != st udyApprova ls) {
  67                             studyA pprovalDTO s = new Ar rayList<>( );
  68                             for(St udyApprova l studyApp roval : st udyApprova ls) {
  69                                      studyApp rovalDTOs. add(conver t(studyApp roval));
  70                             }
  71                    }
  72                    
  73                    retu rn studyAp provalDTOs ;
  74           }
  75  
  76           pu blic Study Approval c onvert(Stu dyApproval DTO studyA pprovalDTO ) {
  77                    Stud yApproval  studyAppro val = new  StudyAppro val();
  78  
  79                    stud yApproval. setId(stud yApprovalD TO.getId() );
  80                    stud yApproval. setProcess Id(9999999 99);
  81                    stud yApproval. setApprova lIdObtaine d(studyApp rovalDTO.g etObtained ());
  82                    stud yApproval. setTitle(s tudyApprov alDTO.getT itle());
  83                    stud yApproval. setDescrip tion(study ApprovalDT O.getDescr iption());
  84                    stud yApproval. setCreated On(DateUti l.getToday sDate());
  85                    stud yApproval. setModifie dOn(DateUt il.getToda ysDate());
  86                    stud yApproval. setCreated By(studyAp provalDTO. getCreated By());
  87                    stud yApproval. setModifie dBy(studyA pprovalDTO .getModifi edBy());
  88                    
  89                    stud yApproval. setActive( studyAppro valDTO.get Active());
  90                    stud yApproval. setActiveD ate(studyA pprovalDTO .getActive Date());
  91                    stud yApproval. setInactiv eDate(stud yApprovalD TO.getInac tiveDate() );
  92                    
  93                    List <Integer>  associated ApprovalId s = studyA pprovalDTO .getAssoci atedApprov als();
  94                    if ( null != as sociatedAp provalIds  && !associ atedApprov alIds.isEm pty()){
  95                             if (nu ll != asso ciatedAppr ovalIds.ge t(0)) {
  96                                      studyApp roval.setA ssociatedS tudyApprov al1(associ atedApprov alIds.get( 0));
  97                             }
  98                             
  99                             if (nu ll != asso ciatedAppr ovalIds.ge t(1)) {
  100                                      studyApp roval.setA ssociatedS tudyApprov al2(associ atedApprov alIds.get( 1));
  101                             }
  102                             
  103                             if (nu ll != asso ciatedAppr ovalIds.ge t(2)) {
  104                                      studyApp roval.setA ssociatedS tudyApprov al3(associ atedApprov alIds.get( 2));
  105                             }
  106                    }
  107  
  108                    retu rn studyAp proval;
  109           }
  110           
  111           pu blic Study Approval c onvert(Lda pStudyAppr oval ldapS tudyApprov al) {
  112                    Stud yApproval  studyAppro val = new  StudyAppro val();
  113                    
  114                    stud yApproval. setTitle(l dapStudyAp proval.get Descriptio n());
  115                    stud yApproval. setDescrip tion(ldapS tudyApprov al.getDesc ription()) ;
  116                    stud yApproval. setActive( (byte) Use rStatusEnu m.ACTIVE.g etId());
  117                    stud yApproval. setActiveD ate(DateUt il.getToda ysDate());
  118                    
  119                    retu rn studyAp proval;
  120           }
  121           
  122           
  123           pu blic User  convert(Ld apUser lda pUser) {
  124                    User  user = ne w User();
  125                    
  126                    user .setFirstN ame(ldapUs er.getFirs tName());
  127                    user .setLastNa me(ldapUse r.getLastN ame());
  128                    
  129                    Stri ng userNam e = ldapUs er.getUser name();
  130                    user .setUserna me((null = = userName  || userNa me.isEmpty ()) ? Stri ngUtils.EM PTY : user Name.trim( ).toUpperC ase());
  131                    
  132                    Stri ng emailId  = ldapUse r.getEmail Id();
  133                    user .setEmailI d((null ==  emailId | | emailId. isEmpty())  ? StringU tils.EMPTY  : emailId .trim().to UpperCase( ));
  134                    
  135                    user .setCreate Date(DateU til.getTod aysDate()) ;
  136                    user .setUserAc tive((byte ) UserStat usEnum.ACT IVE.getId( ));
  137                    user .setActive Date(DateU til.getTod aysDate()) ;
  138                    user .setInacti veDate(lda pUser.getI nactiveDat e());
  139                    
  140                    retu rn user;
  141           }
  142           
  143           pu blic void  populate(S tudyApprov al studyAp roval, Lda pStudyAppr oval ldapS a) {
  144                    stud yAproval.s etTitle(ld apSa.getDe scription( ));
  145                    stud yAproval.s etDescript ion(ldapSa .getDescri ption());
  146                    
  147                    if ( studyAprov al.getActi ve() == Us erStatusEn um.DISABLE .getId())  {
  148                             studyA proval.set Active((by te) UserSt atusEnum.A CTIVE.getI d());
  149                             studyA proval.set ActiveDate (DateUtil. getTodaysD ate());
  150                    }
  151                    stud yAproval.s etModified On(DateUti l.getToday sDate());
  152           }
  153           
  154   }