You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by "zhuangchong (via GitHub)" <gi...@apache.org> on 2023/07/19 01:29:44 UTC
[GitHub] [dolphinscheduler] zhuangchong commented on a diff in pull request #14573: [Feature-14505][UI] Support to set project-level preferences
zhuangchong commented on code in PR #14573:
URL: https://github.com/apache/dolphinscheduler/pull/14573#discussion_r1267435777
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectPreferenceServiceImpl.java:
##########
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.service.impl;
+
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.PROJECT;
+
+import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.service.ProjectPreferenceService;
+import org.apache.dolphinscheduler.api.service.ProjectService;
+import org.apache.dolphinscheduler.api.utils.Result;
+import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
+import org.apache.dolphinscheduler.dao.entity.Project;
+import org.apache.dolphinscheduler.dao.entity.ProjectPreference;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
+import org.apache.dolphinscheduler.dao.mapper.ProjectPreferenceMapper;
+
+import java.util.Date;
+import java.util.Objects;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+@Service
+@Slf4j
+public class ProjectPreferenceServiceImpl extends BaseServiceImpl
+ implements
+ ProjectPreferenceService {
+
+ @Autowired
+ private ProjectPreferenceMapper projectPreferenceMapper;
+
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private ProjectMapper projectMapper;
+
+ @Override
+ public Result updateProjectPreference(User loginUser, long projectCode, String preferences) {
+ Result result = new Result();
+
+ // check if the user has the writing permission for project
+ Project project = projectMapper.queryByCode(projectCode);
+ boolean hasProjectAndWritePerm = projectService.hasProjectAndWritePerm(loginUser, project, result);
+ if (!hasProjectAndWritePerm) {
+ return result;
+ }
+
+ ProjectPreference projectPreference = projectPreferenceMapper
+ .selectOne(new QueryWrapper<ProjectPreference>().lambda().eq(ProjectPreference::getProjectCode,
+ projectCode));
+
+ Date now = new Date();
+ if (Objects.isNull(projectPreference)) {
+ projectPreference = new ProjectPreference();
+ projectPreference.setProjectCode(projectCode);
+ projectPreference.setPreferences(preferences);
+ projectPreference.setUserId(loginUser.getId());
+ projectPreference.setCode(CodeGenerateUtils.getInstance().genCode());
+ projectPreference.setCreateTime(now);
+ projectPreference.setUpdateTime(now);
+ if (projectPreferenceMapper.insert(projectPreference) > 0) {
+ log.info("Project preference is created and id is :{}", projectPreference.getId());
+ result.setData(projectPreference);
+ putMsg(result, Status.SUCCESS);
+ } else {
+ log.error("Project preference create error, projectCode:{}.", projectPreference.getProjectCode());
+ putMsg(result, Status.CREATE_PROJECT_PREFERENCE_ERROR);
+ }
+ } else {
+ projectPreference.setPreferences(preferences);
+ projectPreference.setUserId(loginUser.getId());
+ projectPreference.setUpdateTime(now);
+
+ if (projectPreferenceMapper.updateById(projectPreference) > 0) {
+ log.info("Project preference is updated and id is :{}", projectPreference.getId());
+ result.setData(projectPreference);
+ putMsg(result, Status.SUCCESS);
+ } else {
+ log.error("Project preference update error, projectCode:{}.", projectPreference.getProjectCode());
+ putMsg(result, Status.CREATE_PROJECT_PREFERENCE_ERROR);
+ }
+ }
+ return result;
+ }
+
+ @Override
+ public Result queryProjectPreferenceByProjectCode(User loginUser, long projectCode) {
+ Result result = new Result();
+
+ Project project = projectMapper.queryByCode(projectCode);
+ boolean hasProjectAndPerm = projectService.hasProjectAndPerm(loginUser, project, result, PROJECT);
+ if (!hasProjectAndPerm) {
+ return result;
+ }
+
+ ProjectPreference projectPreference = projectPreferenceMapper
+ .selectOne(new QueryWrapper<ProjectPreference>().lambda().eq(ProjectPreference::getProjectCode,
+ projectCode));
+
+ if (Objects.nonNull(projectPreference)) {
Review Comment:
This judgment can be removed.
##########
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectPreferenceServiceImpl.java:
##########
@@ -0,0 +1,127 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.api.service.impl;
+
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.PROJECT;
+
+import org.apache.dolphinscheduler.api.enums.Status;
+import org.apache.dolphinscheduler.api.service.ProjectPreferenceService;
+import org.apache.dolphinscheduler.api.service.ProjectService;
+import org.apache.dolphinscheduler.api.utils.Result;
+import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
+import org.apache.dolphinscheduler.dao.entity.Project;
+import org.apache.dolphinscheduler.dao.entity.ProjectPreference;
+import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
+import org.apache.dolphinscheduler.dao.mapper.ProjectPreferenceMapper;
+
+import java.util.Date;
+import java.util.Objects;
+
+import lombok.extern.slf4j.Slf4j;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
+
+@Service
+@Slf4j
+public class ProjectPreferenceServiceImpl extends BaseServiceImpl
+ implements
+ ProjectPreferenceService {
+
+ @Autowired
+ private ProjectPreferenceMapper projectPreferenceMapper;
+
+ @Autowired
+ private ProjectService projectService;
+
+ @Autowired
+ private ProjectMapper projectMapper;
+
+ @Override
+ public Result updateProjectPreference(User loginUser, long projectCode, String preferences) {
+ Result result = new Result();
+
+ // check if the user has the writing permission for project
+ Project project = projectMapper.queryByCode(projectCode);
+ boolean hasProjectAndWritePerm = projectService.hasProjectAndWritePerm(loginUser, project, result);
+ if (!hasProjectAndWritePerm) {
+ return result;
+ }
+
+ ProjectPreference projectPreference = projectPreferenceMapper
+ .selectOne(new QueryWrapper<ProjectPreference>().lambda().eq(ProjectPreference::getProjectCode,
+ projectCode));
+
+ Date now = new Date();
+ if (Objects.isNull(projectPreference)) {
+ projectPreference = new ProjectPreference();
+ projectPreference.setProjectCode(projectCode);
+ projectPreference.setPreferences(preferences);
+ projectPreference.setUserId(loginUser.getId());
+ projectPreference.setCode(CodeGenerateUtils.getInstance().genCode());
+ projectPreference.setCreateTime(now);
+ projectPreference.setUpdateTime(now);
+ if (projectPreferenceMapper.insert(projectPreference) > 0) {
+ log.info("Project preference is created and id is :{}", projectPreference.getId());
+ result.setData(projectPreference);
+ putMsg(result, Status.SUCCESS);
+ } else {
+ log.error("Project preference create error, projectCode:{}.", projectPreference.getProjectCode());
+ putMsg(result, Status.CREATE_PROJECT_PREFERENCE_ERROR);
+ }
+ } else {
+ projectPreference.setPreferences(preferences);
+ projectPreference.setUserId(loginUser.getId());
+ projectPreference.setUpdateTime(now);
+
+ if (projectPreferenceMapper.updateById(projectPreference) > 0) {
+ log.info("Project preference is updated and id is :{}", projectPreference.getId());
+ result.setData(projectPreference);
+ putMsg(result, Status.SUCCESS);
+ } else {
+ log.error("Project preference update error, projectCode:{}.", projectPreference.getProjectCode());
+ putMsg(result, Status.CREATE_PROJECT_PREFERENCE_ERROR);
Review Comment:
UPDATE_PROJECT_PREFERENCE_ERROR?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org