Project

General

Profile

« Previous | Next » 

Revision 58394

[use-UoaAdminToolsLibrary | Admin Tools Service]:
REMINDER NOTE: change war name and properties (e.g. in MongoConfig.java) when merging to trunk.
1. Move MongoDBDAOs to folder /dao/MongoDBDAOs.
2. Move entities for Subscriber to folder /entities/subscriber.
3. Move entities for Curator to folder /entities/curator.
4. Add services for Layout, Statistics and Subscribers (to be called by controllers).
5. Rename "CommunitySubscribers" to "PortalSubscribers", "CommunitySubscribersController" to "PortalSubscribersController" and "CommunitySubscribersDAO" to "PortalSubscribersDAO".
6. Update all files to import appropriate files (from library or locally).
7. Create "ConnectController", "ExploreController" and update "CommunityController".
8. UoaAdminToolsApplication.java: scanBasePackages = {"eu.dnetlib.uoaadmintools", "eu.dnetlib.uoaadmintoolslibrary"}
9. MongoConnection.java: basePackages = {"eu.dnetlib.uoaadmintools.dao", "eu.dnetlib.uoaadmintoolslibrary.dao"}
10. Update update_db.js for changing db collections and entries according to new schema.

View differences:

UoaAdminToolsApplicationTests.java
1 1
package eu.dnetlib.uoaadmintools;
2 2

  
3 3
import eu.dnetlib.uoaadmintools.dao.*;
4
import eu.dnetlib.uoaadmintools.entities.*;
5
import eu.dnetlib.uoaadmintools.entities.statistics.Statistics;
4
import eu.dnetlib.uoaadmintoolslibrary.dao.*;
5
import eu.dnetlib.uoaadmintoolslibrary.entities.Page;
6 6
import org.junit.Test;
7 7
import org.junit.runner.RunWith;
8 8
import org.springframework.beans.factory.annotation.Autowired;
9 9
import org.springframework.boot.test.context.SpringBootTest;
10 10
import org.springframework.test.context.junit4.SpringRunner;
11 11

  
12
import java.util.ArrayList;
13
import java.util.HashMap;
14
import java.util.List;
15
import java.util.Map;
16

  
17 12
@RunWith(SpringRunner.class)
18 13
@SpringBootTest
19 14
public class UoaAdminToolsApplicationTests {
20 15

  
21 16
	@Autowired
22
	private CommunityDAO communityDAO;
17
	private PortalDAO communityDAO;
23 18

  
24 19
	@Autowired
25 20
	private EntityDAO entityDAO;
......
40 35
	private SubscriberDAO subscriberDAO;
41 36

  
42 37
	@Autowired
43
	private CommunitySubscribersDAO communitySubscribersDAO;
38
	private PortalSubscribersDAO portalSubscribersDAO;
44 39

  
45 40
/*
46 41

  
......
205 200
//			for(Community c:communities){
206 201
//				String pid = c.getPid();
207 202
//				System.out.println("Community :" +pid);
208
//				CommunitySubscribers communitySubscribers= communitySubscribersDAO.findByPid(pid);
203
//				PortalSubscribers communitySubscribers= portalSubscribersDAO.findByPid(pid);
209 204
//				if(communitySubscribers == null){
210
//					communitySubscribers = new CommunitySubscribers(pid);
211
//					communitySubscribersDAO.save(communitySubscribers);
205
//					communitySubscribers = new PortalSubscribers(pid);
206
//					portalSubscribersDAO.save(communitySubscribers);
212 207
//					System.out.println("Saved community subscribers for :" +pid);
213 208
//				}
214 209
//			}
215 210
	}
216 211

  
217
	@Test
218
	public void testPages() {
212
//	@Test
213
//	public void testPages() {
214
//
215
//		System.out.println( pageDAO.findByConnect(false).size());
216
//		for (Page p: pageDAO.findByConnect(false) ){
217
//			System.out.println(p.getRoute()+" Con: "+p.getConnect()+" Op: "+p.getOpenaire());
218
//		}
219
//	}
219 220

  
220
		System.out.println( pageDAO.findByConnect(false).size());
221
		for (Page p: pageDAO.findByConnect(false) ){
222
			System.out.println(p.getRoute()+" Con: "+p.getConnect()+" Op: "+p.getOpenaire());
223
		}
224
	}
225

  
226 221
}

Also available in: Unified diff