Project

General

Profile

« Previous | Next » 

Revision 60411

Added by Argiro Kokogiannaki about 3 years ago

- fix order by titles
- context query: get results made in the same dashboard
- add claimed_in_dashboard in the result
- commit changes in Test CopyFromBeta

View differences:

CopyFromBetaTest.java
46 46 
    @Test
47 47 
    public void CopyFromBetaToProduction(){
48 48 
        log.setLevel(Level.ERROR);
49 
        QueryGenerator q = new QueryGenerator();
50 
        System.out.println(q.generateCreateClaimTablesQuery());
51 49 
        try {
52 

  		




  53
  
  
    

  		




  54
  
  
    
            fetchClaimHandler.getQueryGenerator().setMigrationTable("claims_beta");


  		




  55
  50
  
    
            ArrayList<String> communities = new ArrayList<>();


  		




  56
  
  
    
            communities.add("ee");


  		




  
  51
  
    
            // 5 connect communities: 793 - done


  		




  
  52
  
    
//            communities.add("ee");


  		




  57
  53
  
    
//            communities.add("mes");


  		




  58
  54
  
    
//            communities.add("fam");


  		




  59
  55
  
    
//            communities.add("ni");


  		




  60
  56
  
    
//            communities.add("dh-ch");


  		




  
  57
  
    

  		




  
  58
  
    
            //2nd group - 1073 - done


  		




  
  59
  
    
            //duplicates ids [20587 -22214]


  		




  
  60
  
    
//            select id, source_id, claimed_in_dashboard from claim where id>20586 and id < 22215 and (source_id like 'elixir-gr%' or source_id like 'enermaps%' or source_id like 'dariah%' or source_id like 'science-innovation-policy%' or source_id like 'oa-pg%');


  		




  
  61
  
    
//            communities.add("elixir-gr");


  		




  
  62
  
    
//            communities.add("enermaps");


  		




  
  63
  
    
//            communities.add("dariah");


  		




  
  64
  
    
//            communities.add("science-innovation-policy");


  		




  
  65
  
    
//            communities.add("oa-pg");


  		




  
  66
  
    

  		




  
  67
  
    
            // 3rd group - 555 - done


  		




  
  68
  
    
//            communities.add("egi");


  		




  
  69
  
    
//            communities.add("rda");


  		




  
  70
  
    

  		




  
  71
  
    

  		




  
  72
  
    
            // 4th group - 32673 - done


  		




  61
  73
  
    
//            communities.add("covid-19");


  		




  62
  74
  
    
            String startDate = "2018-03-01";


  		




  63
  
  
    
            String endDate = "2020-11-22";


  		




  
  75
  
    
            String endDate = "2020-11-24";


  		




  64
  76
  
    

  		




  65
  
  
    
            fetchClaimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://scoobydoo.di.uoa.gr:5432/claims_beta");


  		




  
  77
  
    
            //local


  		




  
  78
  
    
            fetchClaimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://localhost:5432/claims_beta");


  		




  
  79
  
    
            //beta


  		




  
  80
  
    
//            fetchClaimHandler.getSqlDAO().getSqlStore().setDbUser("dnet");


  		




  
  81
  
    
//            fetchClaimHandler.getSqlDAO().getSqlStore().setDbPassword("dnetPwd");


  		




  
  82
  
    
//            fetchClaimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://beta.services.openaire.eu:5432/dnet_openaireplus");


  		




  66
  83
  
    
            List<Claim> claims = fetchClaimHandler.fetchClaimsByDateForDashboards(startDate,endDate,  null,null,true, communities);


  		




  67
  84
  
    
            System.out.println("Beta claims: ");


  		




  68
  85
  
    
            System.out.println(claims.size());


  		




  69
  86
  
    

  		




  70
  
  
    
            claimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://scoobydoo.di.uoa.gr:5432/movedb");


  		




  
  87
  
    
//            fetchClaimHandler.getSqlDAO().getSqlStore().setDbUser("postgres");


  		




  
  88
  
    
//            fetchClaimHandler.getSqlDAO().getSqlStore().setDbPassword("snowflakes");


  		




  
  89
  
    
//            claimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://localhost:5432/movedb");


  		




  
  90
  
    
            //prod


  		




  
  91
  
    
            claimHandler.getSqlDAO().getSqlStore().setDbUser("dnet");


  		




  
  92
  
    
            claimHandler.getSqlDAO().getSqlStore().setDbPassword("dnetPwd");


  		




  
  93
  
    
            claimHandler.getSqlDAO().getSqlStore().setDbUrl("jdbc:postgresql://postgresql.services.openaire.eu:5432/dnet_openaireplus");


  		




  
  94
  
    
           /* out = new PrintWriter(new BufferedWriter(new FileWriter("/home/argirok/claims_migration/claims_migratedFromBeta_record_paths.txt", true)));


  		




  71
  95
  
    

  		




  72
  
  
    
            out = new PrintWriter(new BufferedWriter(new FileWriter("/home/argirok/claims_migratedFromBeta_record_paths.txt", true)));


  		




  73
  
  
    

  		




  74
  96
  
    
            for (Claim claim : claims) {


  		




  75
  97
  
    

  		




  76
  98
  
    
                if(out!=null) {


  		




  ......




  90
  112
  
    
            }


  		




  91
  113
  
    
            if(out!=null) {


  		




  92
  114
  
    
                out.close();


  		




  93
  
  
    
            }


  		




  94
  
  
    
            List<Claim> claimsmoveDB = fetchClaimHandler.fetchClaimsByDate(startDate,endDate, null, null, true);


  		




  95
  
  
    
            System.out.println("Movedb claims:");


  		




  96
  
  
    
            System.out.println(claimsmoveDB.size());


  		




  
  115
  
    
            }*/


  		




  
  116
  
    
//            List<Claim> claimsmoveDB = fetchClaimHandler.countAllClaims(startDate,endDate, null, null, true);


  		




  
  117
  
    
//            System.out.println("Prod claims:");


  		




  
  118
  
    
//            System.out.println(claimsmoveDB.size());


  		




  97
  119
  
    

  		




  98
  120
  
    

  		




  99
  121
  
    
        } catch (Exception | SQLStoreException e) {


  		












Also available in:  Unified diff