删除了Target相关的无用代码

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/TargetService.java

@@ -17,14 +17,6 @@ public interface TargetService {
 
     Page<App> getMyTargets(long ownerId, String keyword, Pageable pageable);
 
-    void createTargetKibug(Application application);
-
-    DevTarget findDevByUpLoadCaseId(long uploadCaseId);
-
-    WebTarget findWebByAppId(long appId);
-
-    void createTargetDev(DevTarget devTarget);
-
     void updateTarget(App app);
 
     void publicityTarget(Long targetId);
@@ -35,8 +27,6 @@ public interface TargetService {
 
     void rejectTarget(long targetId);
 
-    void createTargetWeb(WebTarget webTarget);
-
     Page<App> getAllTargets(Pageable pageable);
 
     App createTarget(App app);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/service/impl/TargetServiceImpl.java

@@ -69,34 +69,6 @@ public class TargetServiceImpl extends BaseService implements TargetService {
     }
 
     @Override
-    public void createTargetKibug(Application application) {
-        IncrementId incrementId = incrementIdDao.save(new IncrementId());
-        application.setId(incrementId.getId());
-        if (application.getEndTimeMillis() == 0) {
-            application.setEndTimeMillis(System.currentTimeMillis() + 2592000000L);
-        }
-        applicationDao.save(application);
-    }
-
-    @Override
-    public DevTarget findDevByUpLoadCaseId(long uploadCaseId) {
-        return targetDevDao.findByUploadedCaseId(uploadCaseId);
-    }
-
-    @Override
-    public WebTarget findWebByAppId(long appId) {
-        return targetWebDao.findBySuperId(appId);
-    }
-
-    @Override
-    public void createTargetDev(DevTarget devTarget) {
-        if (devTarget.getEndTimeMillis() == 0) {
-            devTarget.setEndTimeMillis(System.currentTimeMillis() + 2592000000L);
-        }
-        targetDevDao.save(devTarget);
-    }
-
-    @Override
     public void updateTarget(App app){
         targetDao.save(app);
     }
@@ -194,14 +166,6 @@ public class TargetServiceImpl extends BaseService implements TargetService {
     }
 
     @Override
-    public void createTargetWeb(WebTarget webTarget){
-        if(webTarget.getEndTimeMillis()==0){
-            webTarget.setEndTimeMillis(System.currentTimeMillis()+2592000000l);
-        }
-        targetWebDao.save(webTarget);
-    }
-
-    @Override
     public void verifyApp(App app) {
         targetDao.save(app);
     }

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/ctrl/TargetController.java

@@ -31,65 +31,12 @@ public class TargetController extends BaseController {
     private TargetLogic targetLogic;
 
     @RequiresRoles(value = "manager")
-    @RequestMapping(value = "api/targets/{ownerId}", method = RequestMethod.GET)
-    public Page<TargetVO> getTargets(@PathVariable @NotNull long ownerId, @RequestParam(name = "keyword", required = false) String keyword, HttpServletRequest request) {
-        Integer activePage = Integer.parseInt(request.getHeader("activePage"));
-        Integer rowsOnPage = Integer.parseInt(request.getHeader("rowsOnPage"));
-        Sort sortByCreate=new Sort(Sort.Direction.DESC,"createTime");
-        if (activePage == null || rowsOnPage == null) {
-            return null;
-        }
-        Pageable pageable = new PageRequest(activePage - 1, rowsOnPage, sortByCreate);
-        return targetLogic.getTargets(ownerId, keyword, pageable);
-    }
-
-    @RequiresRoles(value = "manager")
-    @RequestMapping(value = UrlConstants.API + "/targets", method = RequestMethod.GET)
-    public Page<TargetVO> getMyTargets(HttpServletRequest request, @RequestParam(name = "ownerId") long ownerId, @RequestParam(name = "keyword", required = false) String keyword) throws Exception {
-        Integer activePage = Integer.parseInt(request.getHeader("activePage"));
-        Integer rowsOnPage = Integer.parseInt(request.getHeader("rowsOnPage"));
-        Sort sortByCreate=new Sort(Sort.Direction.DESC,"createTime");
-        if (activePage == null || rowsOnPage == null) {
-            return null;
-        }
-        Pageable pageable = new PageRequest(activePage - 1, rowsOnPage, sortByCreate);
-        return targetLogic.getMyTargets(ownerId, keyword, pageable);
-    }
-
-    @RequiresRoles(value = "manager")
-    @RequestMapping(value = UrlConstants.API_TARGET + "kibug", method = RequestMethod.POST)
-    public Map<String, Object> createTargetKibug(@RequestBody @NotNull TargetKibugVO vo) throws Exception {
-        Long id = targetLogic.createTargetKibug(vo);
-        SuccessResult successResult = new SuccessResult();
-        successResult.put(ResponseMessage.ID_RESULT, id);
-        return successResult;
-    }
-
-    @RequiresRoles(value = "manager")
     @RequestMapping(value = "api/target", method = RequestMethod.GET)
     public TargetViewVO getTarget(@RequestParam(name = "targetId") long targetId) throws Exception {
         return targetLogic.getTarget(targetId);
     }
 
     @RequiresRoles(value = "manager")
-    @RequestMapping(value = UrlConstants.API_TARGET + "web", method = RequestMethod.POST)
-    public Map<String, Object> createTargetWeb(@RequestBody @NotNull TargetWebVO vo)throws Exception {
-        Long id=targetLogic.createTargetWeb(vo);
-        SuccessResult successResult = new SuccessResult();
-        successResult.put(ResponseMessage.ID_RESULT, id);
-        return successResult;
-    }
-
-    @RequiresRoles(value = "manager")
-    @RequestMapping(value = "api/target/dev", method = RequestMethod.POST)
-    public Map<String, Object> createTargetDev(@RequestBody @NotNull TargetDevVO vo) throws Exception {
-        Long id = targetLogic.createTargetDev(vo);
-        SuccessResult successResult = new SuccessResult();
-        successResult.put(ResponseMessage.ID_RESULT, id);
-        return successResult;
-    }
-
-    @RequiresRoles(value = "manager")
     @RequestMapping(value = "api/target", method = RequestMethod.PUT)
     public Map<String,Object> updateTarget(@RequestParam(value = "targetId")Long targetId,
                                            @RequestParam(value = "name",required = false)String name,
@@ -119,12 +66,6 @@ public class TargetController extends BaseController {
         return targetLogic.getAllApps(new PageRequest(activePage - 1, rowsOnPage, sortById));
     }
 
-    @RequiresRoles("admin")
-    @RequestMapping(value = UrlConstants.API + "app/{id}", method = RequestMethod.GET)
-    public TargetVO viewApp(@PathVariable("id") long id) {
-        return targetLogic.viewTarget(id);
-    }
-
     @RequiresRoles("manager")
     @RequestMapping(value = UrlConstants.API_TARGET + "node", method = RequestMethod.GET)
     public Map<String,Object> getTargetNode(@RequestParam(value = "targetId")Long targetId){

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/TargetLogic.java

@@ -15,28 +15,14 @@ import java.util.Map;
  */
 public interface TargetLogic {
 
-    List<TargetVO> getManagerTargets(long managerId) throws Exception;
-
-    Page<TargetVO> getTargets(long ownerId, String keyword, Pageable pageable);
-
-    Page<TargetVO> getMyTargets(long ownerId, String keyword, Pageable pageable);
-
-    long createTargetKibug(TargetKibugVO vo) throws Exception;
-
     TargetViewVO getTarget(long targetId) throws Exception;
 
     void updateTarget(Long targetId, String name, Boolean visible) throws Exception;
 
-    long createTargetDev(TargetDevVO vo) throws Exception;
-
-    long createTargetWeb(TargetWebVO vo) throws Exception;
-
     void verifyTarget(long id, TargetVO targetVO);
 
     Page<TargetListVO> getAllApps(Pageable pageable);
 
-    TargetVO viewTarget(long id);
-
     TargetVO getTargetById(Long targetId);
 
     NodeUrlVO getTargetNode(Long targetId);

mooctest-site-server/src/main/java/cn/iselab/mooctest/site/web/logic/impl/TargetLogicImpl.java

@@ -47,9 +47,6 @@ public class TargetLogicImpl extends BaseLogic implements TargetLogic {
     private AppService appService;
 
     @Autowired
-    private ApplicationService applicationService;
-
-    @Autowired
     private TargetService targetService;
 
     @Autowired
@@ -59,15 +56,6 @@ public class TargetLogicImpl extends BaseLogic implements TargetLogic {
     private TargetVOWrapper targetVOWrapper;
 
     @Autowired
-    private TargetKibugVOWrapper targetKibugVOWrapper;
-
-    @Autowired
-    private TargetDevVOWrapper targetDevVOWrapper;
-
-    @Autowired
-    private TargetWebVOWrapper targetWebVOWrapper;
-
-    @Autowired
     private NodeUrlService nodeUrlService;
 
     @Autowired
@@ -92,58 +80,7 @@ public class TargetLogicImpl extends BaseLogic implements TargetLogic {
     PythonNodeProgressLogic pythonNodeProgressLogic;
 
     @Override
-    public List<TargetVO> getManagerTargets(long managerId) throws Exception {
-
-        List<App> apps = appService.getManagerApps(managerId);
-        List<TargetVO> targets = targetVOWrapper.wrap(apps);
-        Application application;
-        for (TargetVO targetVO : targets) {
-            application = applicationService.getAppByUploaderCaseId(targetVO.getId());
-
-            targetVO.setEndTimeMillis(application.getEndTimeMillis());
-            targetVO.setFromCloud(application.getFromCloud());
-        }
-        return targets;
-    }
-
-    @Override
-    public Page<TargetVO> getTargets(long ownerId, String keyword, Pageable pageable) {
-        Page<App2User> apps = targetService.getTargets(ownerId, keyword, pageable);
-        Page<TargetVO> targetVOS = apps.map(new org.springframework.core.convert.converter.Converter<App2User, TargetVO>() {
-            @Override
-            public TargetVO convert(App2User app) {
-                return targetVOWrapper.wrapFromApp2User(app);
-            }
-        });
-        return targetVOS;
-    }
-
-    @Override
-    public Page<TargetVO> getMyTargets(long ownerId, String keyword, Pageable pageable) {
-        Page<App> apps = targetService.getMyTargets(ownerId, keyword, pageable);
-        Page<TargetVO> targetVOS = apps.map(new Converter<App, TargetVO>() {
-            @Override
-            public TargetVO convert(App app) {
-                return targetVOWrapper.wrap(app);
-            }
-        });
-        return targetVOS;
-    }
-
-    @Override
-    public long createTargetKibug(TargetKibugVO vo) throws Exception {
-        App app = targetKibugVOWrapper.wrapApp(vo);
-        Application application = targetKibugVOWrapper.unwrap(vo);
-        app = appService.uploadCase(app);
-        setPemission(app);
-        application.setUploadedCaseId(app.getId());
-        applicationService.createApp(application);
-        setListener(app.getId(), app.getTargetType(), app.getUrl());
-        return app.getId();
-    }
-
-    @Override
-    public TargetViewVO getTarget(long targetId) throws Exception {
+    public TargetViewVO getTarget(long targetId){
         App app = targetService.findById(targetId);
         if (app == null) {
             throw new HttpNotFoundException("Cannot find Target");
@@ -171,36 +108,6 @@ public class TargetLogicImpl extends BaseLogic implements TargetLogic {
         }
         targetService.updateTarget(app);
     }
-
-    @Override
-    public long createTargetDev(TargetDevVO vo) throws Exception {
-        App app = targetDevVOWrapper.wrap(vo);
-        DevTarget devTarget = targetDevVOWrapper.wrapDev(vo);
-        app = appService.uploadCase(app);
-        setPemission(app);
-        devTarget.setUploadedCaseId(app.getId());
-        targetService.createTargetDev(devTarget);
-        if(devTarget.getLanguage().equals(DevLanguageConstants.JAVA)){
-            mutationProgressLogic.trigegrTargetAnalysis(app.getId(),app.getUrl());
-            mcNodeProgressLogic.trigegrTargetAnalysis(app.getId(),app.getUrl());
-        }else if(devTarget.getLanguage().equals(DevLanguageConstants.PYTHON)){
-            pythonNodeProgressLogic.triggerTargetAnalysis(app.getId(),app.getUrl());
-        }
-        return app.getId();
-    }
-
-    @Override
-    public long createTargetWeb(TargetWebVO vo) throws Exception {
-        App app = targetWebVOWrapper.wrap(vo);
-        WebTarget webTarget = targetWebVOWrapper.wrapWeb(vo);
-        app = appService.uploadCase(app);
-        setPemission(app);
-        webTarget.setSuperId(app.getId());
-        targetService.createTargetWeb(webTarget);
-        setListener(app.getId(), app.getTargetType(), app.getUrl());
-        return app.getId();
-    }
-
     @Override
     public void verifyTarget(long id, TargetVO targetVO) {
         App app = targetService.findById(id);
@@ -217,11 +124,6 @@ public class TargetLogicImpl extends BaseLogic implements TargetLogic {
         return appPage.map(app -> targetVOWrapper.wrapTargetListVO(app));
     }
 
-    @Override
-    public TargetVO viewTarget(long id) {
-        return targetVOWrapper.wrap(appService.getAppById(id));
-    }
-
     private void setPemission(App app) {
         if (!app.getVisible()) {
             appPermissionService.uploadApp(app.getOwnerId(), app.getId());

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/service/impl/TargetServiceImplTest.java

@@ -102,35 +102,4 @@ public class TargetServiceImplTest {
         List<App> result=resultApp.getContent();
         Assert.assertEquals(expect,result);
     }
-
-    @Test
-    public void should_saveTargetKibug_when_TargetKibugExists(){
-        cn.iselab.mooctest.site.models.fromKibug.Application application=new cn.iselab.mooctest.site.models.fromKibug.Application();
-        IncrementId incrementId = new IncrementId();
-        incrementId.setId(111111);
-        when(incrementIdDao.save(any(IncrementId.class))).thenReturn(incrementId);
-
-        targetService.createTargetKibug(application);
-
-        Mockito.verify(applicationDao).save(any(cn.iselab.mooctest.site.models.fromKibug.Application.class));
-    }
-
-    @Test
-    public void should_saveDevTarget_when_DevTargetExists(){
-        DevTarget devTarget=new DevTarget();
-
-        targetService.createTargetDev(devTarget);
-
-        Mockito.verify(targetDevDao).save(any(DevTarget.class));
-    }
-
-    @Test
-    public void should_returnDevTarget_when_DevTargetExists(){
-        DevTarget devTarget=new DevTarget();
-        when(targetDevDao.findByUploadedCaseId(anyLong())).thenReturn(devTarget);
-
-        DevTarget result=targetService.findDevByUpLoadCaseId(1L);
-
-        Assert.assertEquals(devTarget,result);
-    }
 }

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/ctrl/TargetControllerTest.java

@@ -96,60 +96,6 @@ public class TargetControllerTest {
     }
 
     @Test
-    public void should_return_TargetPage_when_TargetExists() throws Exception{
-        Page<TargetVO> expect=new PageImpl<TargetVO>(targets);
-        when(targetLogic.getTargets(anyLong(),anyString(),any(Pageable.class))).thenReturn(expect);
-
-        MvcResult result=mockMvc.perform(
-                get("/api/targets/17")
-                        .header("activePage","1")
-                        .header("rowsOnPage","10")
-                        .param("keyword","test")
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-
-        JSONObject jsonObject=new JSONObject(result.getResponse().getContentAsString());
-        JSONArray jsonArray=jsonObject.getJSONArray("content");
-        Assert.assertEquals(1L,jsonArray.getJSONObject(0).getLong("id"));
-    }
-
-    @Test
-    public void should_return_MyTargetPage_when_given_ownerId_and_keyword()throws Exception{
-        Page<TargetVO> expect=new PageImpl<TargetVO>(targets);
-        when(targetLogic.getMyTargets(anyLong(),anyString(),any(Pageable.class))).thenReturn(expect);
-
-        MvcResult result=mockMvc.perform(
-                get("/api/targets")
-                        .header("activePage","1")
-                        .header("rowsOnPage","10")
-                        .param("ownerId","1")
-                        .param("keyword","test")
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-
-        JSONObject jsonObject=new JSONObject(result.getResponse().getContentAsString());
-        JSONArray jsonArray=jsonObject.getJSONArray("content");
-        Assert.assertEquals(1L,jsonArray.getJSONObject(0).getLong("id"));
-    }
-
-    @Test
-    public void should_createTargetKibug_when_given_Target() throws Exception{
-        when(targetLogic.createTargetKibug(any(TargetKibugVO.class))).thenReturn(expectId);
-
-        JSONObject jsonObject=new JSONObject();
-        jsonObject.put("managerId",17);
-        jsonObject.put("name","test");
-        jsonObject.put("url","test");
-        jsonObject.put("subsiteId",6);
-        jsonObject.put("platform","Android");
-        jsonObject.put("appLocation","test");
-        jsonObject.put("visible",false);
-        jsonObject.put("createTimeMillis","1496145926000");
-        MvcResult result=mockMvc.perform(
-                post("/api/target/kibug").contentType(MediaType.APPLICATION_JSON).content(jsonObject.toString())
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-        Assert.assertEquals(result.getResponse().getContentAsString(),"{\"id\":1,\"status\":2000}");
-    }
-
-    @Test
     public void should_return_TargetKibugVO_when_TargetKibugVOExists()throws Exception{
         when(targetLogic.getTarget(anyLong())).thenReturn(null);
 
@@ -160,23 +106,4 @@ public class TargetControllerTest {
         JSONObject object=new JSONObject(result.getResponse().getContentAsString());
         Assert.assertEquals(targetKibugVO.getName(),object.getJSONObject("data").getString("name"));
     }
-
-    @Test
-    public void should_createDevTarget_when_given_TargetDev()throws Exception{
-        when(targetLogic.createTargetDev(any(TargetDevVO.class))).thenReturn(expectId);
-
-        JSONObject jsonObject=new JSONObject();
-        jsonObject.put("managerId",17);
-        jsonObject.put("name","test");
-        jsonObject.put("url","test");
-        jsonObject.put("subsiteId",6);
-        jsonObject.put("appLocation","test");
-        jsonObject.put("visible",false);
-        jsonObject.put("createTimeMillis","1496145926000");
-        MvcResult result=mockMvc.perform(
-                post("/api/target/dev").contentType(MediaType.APPLICATION_JSON).content(jsonObject.toString())
-        ).andDo(print()).andExpect(status().isOk()).andReturn();
-
-        Assert.assertEquals(result.getResponse().getContentAsString(),"{\"id\":1,\"status\":2000}");
-    }
 }

mooctest-site-server/src/test/java/cn/iselab/mooctest/site/web/logic/impl/TargetLogicImplTest.java

@@ -91,27 +91,6 @@ public class TargetLogicImplTest {
         pageable=new PageRequest(0, 10);
     }
 
-    @Test
-    public void should_returnTargetsList_when_TargetsListExists() throws Exception{
-        List<TargetVO> expect = new ArrayList<>();
-        expect.add(targetVO);
-
-        List<App> apps=new ArrayList<>();
-        apps.add(app);
-        when(appService.getManagerApps(17L)).thenReturn(apps);
-
-        when(targetVOWrapper.wrap(apps)).thenReturn(expect);
-
-        Application application=new Application();
-        application.setUploadedCaseId(1L);
-        application.setEndTimeMillis(1497856289L);
-        application.setFromCloud(1);
-        application.setStatus(new Short("1"));
-        when(applicationService.getAppByUploaderCaseId(1L)).thenReturn(application);
-
-        List<TargetVO> result = targetLogic.getManagerTargets(17L);
-        Assert.assertEquals(expect,result);
-    }
 
     @Test
     public void should_returnTargetsPage_when_TargetsExists() throws Exception{
@@ -132,57 +111,6 @@ public class TargetLogicImplTest {
     }
 
     @Test
-    public void should_return_MyTargets_when_given_ownerId_and_keyword()throws Exception{
-        List<TargetVO> targetVOList=new ArrayList<>();
-        targetVOList.add(targetVO);
-        Page<TargetVO> expect=new PageImpl<TargetVO>(targetVOList);
-
-        List<App> appList=new ArrayList<>();
-        appList.add(app);
-        Page<App> appPage=new PageImpl<App>(appList);
-
-        when(targetService.getMyTargets(anyLong(),anyString(),any(Pageable.class))).thenReturn(appPage);
-        when(targetVOWrapper.wrap(app)).thenReturn(targetVO);
-
-        Page<TargetVO> result=targetLogic.getMyTargets(1L,"TEST",pageable);
-        Assert.assertEquals(result,expect);
-    }
-
-    @Test
-    public void should_createTargetKibug_when_givenTargetKibug() throws Exception{
-        TargetKibugVO targetKibugVO=new TargetKibugVO();
-        targetKibugVO.setName("test");
-        targetKibugVO.setPlatform("Android");
-        targetKibugVO.setAppLocation("test");
-        targetKibugVO.setTargetType(6L);
-        targetKibugVO.setVisible(false);
-        targetKibugVO.setUrl("test");
-        targetKibugVO.setCreateTimeMillis(1498469299L);
-
-        App app=new App();
-        app.setName("test");
-        app.setId(1L);
-        app.setCreateTime(new Timestamp(1498469299));
-        app.setTargetType(6L);
-        app.setVisible(false);
-        when(targetKibugVOWrapper.wrapApp(targetKibugVO)).thenReturn(app);
-
-        Application application=new Application();
-        application.setManagerId(17L);
-        application.setName("test");
-        application.setPlatform(new Short("1"));
-        application.setAppLocation("test");
-        application.setCreateTimeMillis(1498469299L);
-        when(targetKibugVOWrapper.unwrap(targetKibugVO)).thenReturn(application);
-
-        when(appService.uploadCase(app)).thenReturn(app);
-
-        long result=targetLogic.createTargetKibug(targetKibugVO);
-
-        Assert.assertEquals(result,expectID);
-    }
-
-    @Test
     public void should_return_TargetKibugVO_when_TargetKibugExists()throws Exception{
         TargetKibugVO targetKibugVO=new TargetKibugVO();
         targetKibugVO.setName("test");
@@ -218,20 +146,4 @@ public class TargetLogicImplTest {
 
         Assert.assertEquals(expect.get("data"),"");
     }
-
-    @Test
-    public void should_returnTargetId_when_createDevTarget()throws Exception{
-        TargetDevVO devVO=new TargetDevVO();
-        App app=new App();
-        app.setId(1L);
-        DevTarget devTarget=new DevTarget();
-
-        when(targetDevVOWrapper.wrap(any(TargetDevVO.class))).thenReturn(app);
-        when(targetDevVOWrapper.wrapDev(any(TargetDevVO.class))).thenReturn(devTarget);
-        when(appService.uploadCase(any(App.class))).thenReturn(app);
-
-        long result=targetLogic.createTargetDev(any(TargetDevVO.class));
-
-        Assert.assertEquals(result,expectID);
-    }
 }