Fix(Issue#202): counts in one request

server/issue.go

@@ -24,6 +24,13 @@ type ExtendedIssue struct {
 	ForeignPosition int    `json:"position"`
 }
 
+// CountIssue for all counter issues
+type CountIssue struct {
+	In  int `json:"in"`
+	My  int `json:"my"`
+	Out int `json:"out"`
+}
+
 func newIssue(message string, description, postID string) *Issue {
 	return &Issue{
 		ID:          model.NewId(),

server/list.go

@@ -43,6 +43,9 @@ type ListStore interface {
 
 	// GetList returns the list of IssueRef in listID for userID
 	GetList(userID, listID string) ([]*IssueRef, error)
+
+	// CountIssues returns all counter issues
+	CountIssues(userID string) (*CountIssue, error)
 }
 
 type listManager struct {
@@ -135,6 +138,10 @@ func (l *listManager) GetIssueList(userID, listID string) ([]*ExtendedIssue, err
 	return extendedIssues, nil
 }
 
+func (l *listManager) CountIssues(userID string) (countIssues *CountIssue, err error) {
+	return l.store.CountIssues(userID)
+}
+
 func (l *listManager) CompleteIssue(userID, issueID string) (issue *Issue, foreignID string, listToUpdate string, err error) {
 	issueList, ir, _ := l.store.GetIssueListAndReference(userID, issueID)
 	if ir == nil {

server/plugin.go

@@ -32,6 +32,8 @@ type ListManager interface {
 	SendIssue(senderID, receiverID, message, description, postID string) (string, error)
 	// GetIssueList gets the todos on listID for userID
 	GetIssueList(userID, listID string) ([]*ExtendedIssue, error)
+	// CountIssues get counter all issues
+	CountIssues(userID string) (*CountIssue, error)
 	// CompleteIssue completes the todo issueID for userID, and returns the issue and the foreign ID if any
 	CompleteIssue(userID, issueID string) (issue *Issue, foreignID string, listToUpdate string, err error)
 	// AcceptIssue moves one the todo issueID of userID from inbox to myList, and returns the message and the foreignUserID if any
@@ -116,6 +118,7 @@ func (p *Plugin) initializeAPI() {
 
 	p.router.HandleFunc("/add", p.checkAuth(p.handleAdd)).Methods(http.MethodPost)
 	p.router.HandleFunc("/list", p.checkAuth(p.handleList)).Methods(http.MethodGet)
+	p.router.HandleFunc("/count", p.checkAuth(p.handleCount)).Methods(http.MethodGet)
 	p.router.HandleFunc("/remove", p.checkAuth(p.handleRemove)).Methods(http.MethodPost)
 	p.router.HandleFunc("/complete", p.checkAuth(p.handleComplete)).Methods(http.MethodPost)
 	p.router.HandleFunc("/accept", p.checkAuth(p.handleAccept)).Methods(http.MethodPost)
@@ -340,6 +343,30 @@ func (p *Plugin) handleList(w http.ResponseWriter, r *http.Request) {
 	}
 }
 
+func (p *Plugin) handleCount(w http.ResponseWriter, r *http.Request) {
+	userID := r.Header.Get("Mattermost-User-ID")
+
+	countIssues, err := p.listManager.CountIssues(userID)
+	if err != nil {
+		p.API.LogError("Unable to get issues for user err=" + err.Error())
+		p.handleErrorWithCode(w, http.StatusInternalServerError, "Unable to get issues for user", err)
+		return
+	}
+
+	countIssuesJSON, err := json.Marshal(countIssues)
+	if err != nil {
+		p.API.LogError("Unable marhsal count issue list to json err=" + err.Error())
+		p.handleErrorWithCode(w, http.StatusInternalServerError, "Unable marhsal count issue list to json", err)
+		return
+	}
+
+	_, err = w.Write(countIssuesJSON)
+	if err != nil {
+		p.API.LogError("Unable to write json response err=" + err.Error())
+	}
+
+}
+
 func (p *Plugin) handleEdit(w http.ResponseWriter, r *http.Request) {
 	userID := r.Header.Get("Mattermost-User-ID")
 

server/store.go

@@ -327,6 +327,28 @@ func (l *listStore) getList(userID, listID string) ([]*IssueRef, []byte, error)
 	return list, originalJSONList, nil
 }
 
+func (l *listStore) CountIssues(userID string) (*CountIssue, error) {
+	myList, err := l.GetList(userID, MyListKey)
+	if err != nil {
+		return nil, err
+	}
+	inList, err := l.GetList(userID, InListKey)
+	if err != nil {
+		return nil, err
+	}
+	outList, err := l.GetList(userID, OutListKey)
+	if err != nil {
+		return nil, err
+	}
+
+	return &CountIssue{
+		In:  len(inList),
+		My:  len(myList),
+		Out: len(outList),
+	}, nil
+
+}
+
 func (l *listStore) saveList(userID, listID string, list []*IssueRef, originalJSONList []byte) (bool, error) {
 	newJSONList, jsonErr := json.Marshal(list)
 	if jsonErr != nil {

webapp/src/action_types.js

@@ -15,6 +15,7 @@ export const REMOVE_ASSIGNEE = pluginId + '_remove_assignee';
 export const GET_ISSUES = pluginId + '_get_issues';
 export const GET_OUT_ISSUES = pluginId + '_get_out_issues';
 export const GET_IN_ISSUES = pluginId + '_get_in_issues';
+export const GET_COUNT_ISSUES = pluginId + '_get_count_issues';
 export const RECEIVED_SHOW_RHS_ACTION = pluginId + '_show_rhs';
 export const UPDATE_RHS_STATE = pluginId + '_update_rhs_state';
 export const SET_RHS_VISIBLE = pluginId + '_set_rhs_visible';

webapp/src/actions.js

@@ -20,6 +20,7 @@ import {
     CLOSE_ADD_CARD,
     SET_EDITING_TODO,
     REMOVE_EDITING_TODO,
+    GET_COUNT_ISSUES,
 } from './action_types';
 
 import {getPluginServerRoute} from './selectors';
@@ -174,6 +175,26 @@ export const list = (reminder = false, listName = 'my') => async (dispatch, getS
     return {data};
 };
 
+export const count = () => async (dispatch, getState) => {
+    let resp;
+    let data;
+    try {
+        resp = await fetch(getPluginServerRoute(getState()) + '/count', Client4.getOptions({
+            method: 'get',
+        }));
+        data = await resp.json();
+    } catch (error) {
+        return {error};
+    }
+
+    dispatch({
+        type: GET_COUNT_ISSUES,
+        data,
+    });
+
+    return {data};
+};
+
 export const remove = (id) => async (dispatch, getState) => {
     await fetch(getPluginServerRoute(getState()) + '/remove', Client4.getOptions({
         method: 'post',

webapp/src/components/sidebar_buttons/index.js

@@ -4,27 +4,25 @@
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 
-import {list, updateRhsState, telemetry} from '../../actions';
+import {count, updateRhsState, telemetry} from '../../actions';
 
 import SidebarButtons from './sidebar_buttons.jsx';
 
 function mapStateToProps(state) {
     return {
-        issues: state['plugins-com.mattermost.plugin-todo'].issues,
-        inIssues: state['plugins-com.mattermost.plugin-todo'].inIssues,
-        outIssues: state['plugins-com.mattermost.plugin-todo'].outIssues,
+        countIssues: state['plugins-com.mattermost.plugin-todo'].countIssues,
         showRHSPlugin: state['plugins-com.mattermost.plugin-todo'].rhsPluginAction,
     };
 }
 
 function mapDispatchToProps(dispatch) {
     return {
         actions: bindActionCreators({
-            list,
+            count,
             updateRhsState,
             telemetry,
         }, dispatch),
     };
 }
 
-export default connect(mapStateToProps, mapDispatchToProps)(SidebarButtons);
+export default connect(mapStateToProps, mapDispatchToProps)(SidebarButtons);

webapp/src/components/sidebar_buttons/sidebar_buttons.jsx

@@ -13,11 +13,9 @@ export default class SidebarButtons extends React.PureComponent {
         theme: PropTypes.object.isRequired,
         isTeamSidebar: PropTypes.bool,
         showRHSPlugin: PropTypes.func.isRequired,
-        issues: PropTypes.arrayOf(PropTypes.object),
-        inIssues: PropTypes.arrayOf(PropTypes.object),
-        outIssues: PropTypes.arrayOf(PropTypes.object),
+        countIssues: PropTypes.object,
         actions: PropTypes.shape({
-            list: PropTypes.func.isRequired,
+            count: PropTypes.func.isRequired,
             updateRhsState: PropTypes.func.isRequired,
             telemetry: PropTypes.func.isRequired,
         }).isRequired,
@@ -49,9 +47,7 @@ export default class SidebarButtons extends React.PureComponent {
             container = style.containerTeam;
         }
 
-        const issues = this.props.issues || [];
-        const inIssues = this.props.inIssues || [];
-        const outIssues = this.props.outIssues || [];
+        const countIssues = this.props.countIssues;
 
         return (
             <div style={container}>
@@ -68,7 +64,7 @@ export default class SidebarButtons extends React.PureComponent {
                         }}
                     >
                         <i className='icon icon-check'/>
-                        {' ' + issues.length}
+                        {' ' + countIssues.my}
                     </a>
                 </OverlayTrigger>
                 <OverlayTrigger
@@ -84,7 +80,7 @@ export default class SidebarButtons extends React.PureComponent {
                         style={button}
                     >
                         <i className='icon icon-arrow-down'/>
-                        {' ' + inIssues.length}
+                        {' ' + countIssues.in}
                     </a>
                 </OverlayTrigger>
                 <OverlayTrigger
@@ -100,7 +96,7 @@ export default class SidebarButtons extends React.PureComponent {
                         style={button}
                     >
                         <i className='icon icon-arrow-up'/>
-                        {' ' + outIssues.length}
+                        {' ' + countIssues.out}
                     </a>
                 </OverlayTrigger>
             </div>

webapp/src/index.js

@@ -6,7 +6,7 @@ import Root from './components/root';
 import AssigneeModal from './components/assignee_modal';
 import SidebarRight from './components/sidebar_right';
 
-import {openAddCard, list, setShowRHSAction, telemetry, updateConfig, setHideTeamSidebar} from './actions';
+import {openAddCard, list, setShowRHSAction, telemetry, updateConfig, setHideTeamSidebar, count} from './actions';
 import reducer from './reducer';
 import PostTypeTodo from './components/post_type_todo';
 import TeamSidebar from './components/team_sidebar';
@@ -66,11 +66,15 @@ export default class Plugin {
             return frontendListName;
         };
 
-        const refresh = ({data: {lists}}) => lists.forEach((listName) => store.dispatch(list(false, getFrontendListName(listName))));
+        const refresh = ({data: {lists}}) => {
+            lists.forEach((listName) => store.dispatch(list(false, getFrontendListName(listName))));
+            store.dispatch(count());
+        };
         const refreshAll = () => {
             store.dispatch(list(false));
             store.dispatch(list(false, 'in'));
             store.dispatch(list(false, 'out'));
+            store.dispatch(count());
         };
 
         const iconURL = getPluginServerRoute(store.getState()) + '/public/app-bar-icon.png';
@@ -83,9 +87,7 @@ export default class Plugin {
         registry.registerWebSocketEventHandler(`custom_${pluginId}_refresh`, refresh);
         registry.registerReconnectHandler(refreshAll);
 
-        store.dispatch(list(true));
-        store.dispatch(list(false, 'in'));
-        store.dispatch(list(false, 'out'));
+        store.dispatch(count());
 
         // register websocket event to track config changes
         const configUpdate = ({data}) => {

webapp/src/reducer.js

@@ -12,6 +12,7 @@ import {
     GET_ISSUES,
     SET_EDITING_TODO,
     REMOVE_EDITING_TODO,
+    GET_COUNT_ISSUES,
     GET_IN_ISSUES,
     GET_OUT_ISSUES,
     RECEIVED_SHOW_RHS_ACTION,
@@ -113,6 +114,15 @@ const outIssues = (state = [], action) => {
     }
 };
 
+const countIssues = (state = {}, action) => {
+    switch (action.type) {
+    case GET_COUNT_ISSUES:
+        return action.data;
+    default:
+        return state;
+    }
+};
+
 function rhsPluginAction(state = null, action) {
     switch (action.type) {
     case RECEIVED_SHOW_RHS_ACTION:
@@ -159,6 +169,7 @@ export default combineReducers({
     issues,
     inIssues,
     outIssues,
+    countIssues,
     rhsState,
     rhsPluginAction,
     isRhsVisible,

webapp/src/selectors.js

@@ -27,6 +27,7 @@ export const getMessage = (state) => {
 export const getIssues = (state) => getPluginState(state).issues;
 export const getInIssues = (state) => getPluginState(state).inIssues;
 export const getOutIssues = (state) => getPluginState(state).outIssues;
+export const getCountIssues = (state) => getPluginState(state).countIssues;
 export const getCurrentTeamRoute = (state) => {
     const basePath = getSiteURL(state);
     const teamName = state.entities.teams.teams[state.entities.teams.currentTeamId].name;