Merge branch 'master' into translation

README.md

@@ -5,7 +5,7 @@
 
 Razeedash-API is the interface used by
 
-- app.razee.io
+- [Razeedash](https://github.com/razee-io/Razeedash)
 - [watch-keeper](https://github.com/razee-io/watch-keeper)
 
 ## Requirements

app/apollo/models/channel.schema.js

@@ -54,6 +54,11 @@ const ChannelSchema = new mongoose.Schema({
       }
     }
   ],
+  tags: [
+    {
+      type: String,
+    }
+  ],
 }, {
   strict:'throw',
 });

app/apollo/models/subscription.schema.js

@@ -35,6 +35,9 @@ const SubscriptionSchema = new mongoose.Schema({
       type: String,
     }
   ],
+  clusterId: {
+    type: String,
+  },
   channel_uuid: {
     type: String,
     alias: 'channelUuid',

app/apollo/resolvers/channel.js

@@ -28,7 +28,7 @@ const { applyQueryFieldsToChannels } = require('../utils/applyQueryFields');
 const yaml = require('js-yaml');
 
 const { ACTIONS, TYPES, CHANNEL_VERSION_YAML_MAX_SIZE_LIMIT_MB, CHANNEL_LIMITS, CHANNEL_VERSION_LIMITS } = require('../models/const');
-const { whoIs, validAuth, getAllowedChannels, NotFoundError, RazeeValidationError, BasicRazeeError, RazeeQueryError} = require ('./common');
+const { whoIs, validAuth, getAllowedChannels, filterChannelsToAllowed, NotFoundError, RazeeValidationError, BasicRazeeError, RazeeQueryError} = require ('./common');
 
 const { encryptOrgData, decryptOrgData} = require('../../utils/orgs');
 
@@ -87,6 +87,26 @@ const channelResolvers = {
       }
       return channel;
     },
+    channelsByTags: async(parent, { orgId, tags }, context, fullQuery)=>{
+      const queryFields = GraphqlFields(fullQuery);
+      const { models, me, req_id, logger } = context;
+      const queryName = 'channelsByTags';
+      logger.debug({req_id, user: whoIs(me), orgId, tags}, `${queryName} enter`);
+
+      try{
+        if(tags.length < 1){
+          throw new RazeeValidationError('Please supply one or more tags', context);
+        }
+        var channels = await models.Channel.find({ org_id: orgId, tags: { $all: tags } });
+        channels = await filterChannelsToAllowed(me, orgId, ACTIONS.READ, TYPES.CHANNEL, channels, context);
+        await applyQueryFieldsToChannels(channels, queryFields, { orgId }, context);
+
+      }catch(err){
+        logger.error(err, `${queryName} encountered an error when serving ${req_id}.`);
+        throw new RazeeQueryError(`Query ${queryName} error. ${err.message}`, context);
+      }
+      return channels;
+    },
     channelVersionByName: async(parent, { orgId: org_id, channelName, versionName }, context) => {
       const { me, req_id, logger } = context;
       const queryName = 'channelVersionByName';
@@ -153,7 +173,7 @@ const channelResolvers = {
     }
   },
   Mutation: {
-    addChannel: async (parent, { orgId: org_id, name }, context)=>{
+    addChannel: async (parent, { orgId: org_id, name, tags=[] }, context)=>{
       const { models, me, req_id, logger } = context;
       const queryName = 'addChannel';
       logger.debug({ req_id, user: whoIs(me), org_id, name }, `${queryName} enter`);
@@ -175,6 +195,7 @@ const channelResolvers = {
         await models.Channel.create({
           _id: UUID(),
           uuid, org_id, name, versions: [],
+          tags,
         });
         return {
           uuid,
@@ -187,7 +208,7 @@ const channelResolvers = {
         throw new RazeeQueryError(context.req.t('Query {{queryName}} error. {{err.message}}', {'queryName':queryName, 'err.message':err.message}), context);
       }
     },
-    editChannel: async (parent, { orgId: org_id, uuid, name }, context)=>{
+    editChannel: async (parent, { orgId: org_id, uuid, name, tags=[] }, context)=>{
       const { models, me, req_id, logger } = context;
       const queryName = 'editChannel';
       logger.debug({ req_id, user: whoIs(me), org_id, uuid, name }, `${queryName} enter`);
@@ -198,7 +219,7 @@ const channelResolvers = {
           throw new NotFoundError(context.req.t('channel uuid "{{uuid}}" not found', {'uuid':uuid}), context);
         }
         await validAuth(me, org_id, ACTIONS.UPDATE, TYPES.CHANNEL, queryName, context, [channel.uuid, channel.name]);
-        await models.Channel.updateOne({ org_id, uuid }, { $set: { name } });
+        await models.Channel.updateOne({ org_id, uuid }, { $set: { name, tags } });
 
         // find any subscriptions for this channel and update channelName in those subs
         await models.Subscription.updateMany(
@@ -210,6 +231,7 @@ const channelResolvers = {
           uuid,
           success: true,
           name,
+          tags,
         };
       } catch(err){
         if (err instanceof BasicRazeeError) {

app/apollo/resolvers/subscription.js

@@ -87,7 +87,10 @@ const subscriptionResolvers = {
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['stage'] ==> false
         var foundSubscriptions = await models.Subscription.find({
           'org_id': org_id,
-          groups: { $in: clusterGroupNames },
+          $or: [
+            { groups: { $in: clusterGroupNames } },
+            { clusterId: cluster_id },
+          ],
         }).lean(/* skip virtuals: true for now since it is class facing api. */);
         _.each(foundSubscriptions, (sub)=>{
           if(_.isUndefined(sub.channelName)){
@@ -202,7 +205,13 @@ const subscriptionResolvers = {
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['dev', 'prod'] ==> true
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['dev', 'prod', 'stage'] ==> true
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['stage'] ==> false
-        var subscriptions = await models.Subscription.find({org_id, groups: { $in: clusterGroupNames },}).lean({ virtuals: true });
+        var subscriptions = await models.Subscription.find({
+          org_id,
+          $or: [
+            { groups: { $in: clusterGroupNames } },
+            { clusterId: cluster_id },
+          ],
+        }).lean({ virtuals: true });
         subscriptions = await filterSubscriptionsToAllowed(me, org_id, ACTIONS.READ, TYPES.SUBSCRIPTION, subscriptions, context);
       }catch(err){
         logger.error(err);
@@ -256,7 +265,13 @@ const subscriptionResolvers = {
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['dev', 'prod'] ==> true
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['dev', 'prod', 'stage'] ==> true
         //   subscription groups: ['dev', 'prod'] , clusterGroupNames: ['stage'] ==> false
-        var subscriptions = await models.Subscription.find({org_id, groups: { $in: clusterGroupNames },}).lean({ virtuals: true });
+        var subscriptions = await models.Subscription.find({
+          org_id,
+          $or: [
+            { groups: { $in: clusterGroupNames } },
+            { clusterId: cluster.cluster_id },
+          ]
+        }).lean({ virtuals: true });
         subscriptions = await filterSubscriptionsToAllowed(me, org_id, ACTIONS.READ, TYPES.SUBSCRIPTION, subscriptions, context);
       }catch(err){
         logger.error(err);
@@ -277,7 +292,7 @@ const subscriptionResolvers = {
     }
   },
   Mutation: {
-    addSubscription: async (parent, { orgId: org_id, name, groups, channelUuid: channel_uuid, versionUuid: version_uuid }, context)=>{
+    addSubscription: async (parent, { orgId: org_id, name, groups=[], channelUuid: channel_uuid, versionUuid: version_uuid, clusterId=null }, context)=>{
       const { models, me, req_id, logger } = context;
       const queryName = 'addSubscription';
       logger.debug({req_id, user: whoIs(me), org_id }, `${queryName} enter`);
@@ -312,7 +327,8 @@ const subscriptionResolvers = {
         await models.Subscription.create({
           _id: UUID(),
           uuid, org_id, name, groups, owner: me._id,
-          channelName: channel.name, channel_uuid, version: version.name, version_uuid
+          channelName: channel.name, channel_uuid, version: version.name, version_uuid,
+          clusterId,
         });
 
         pubSub.channelSubChangedFunc({org_id: org_id}, context);
@@ -329,7 +345,7 @@ const subscriptionResolvers = {
         throw new RazeeQueryError(context.req.t('Query {{queryName}} error. {{err.message}}', {'queryName':queryName, 'err.message':err.message}), context);
       }
     },
-    editSubscription: async (parent, { orgId, uuid, name, groups, channelUuid: channel_uuid, versionUuid: version_uuid }, context)=>{
+    editSubscription: async (parent, { orgId, uuid, name, groups=[], channelUuid: channel_uuid, versionUuid: version_uuid, clusterId=null }, context)=>{
       const { models, me, req_id, logger } = context;
       const queryName = 'editSubscription';
       logger.debug({req_id, user: whoIs(me), orgId }, `${queryName} enter`);
@@ -363,6 +379,7 @@ const subscriptionResolvers = {
         var sets = {
           name, groups,
           channelName: channel.name, channel_uuid, version: version.name, version_uuid,
+          clusterId,
         };
         await models.Subscription.updateOne({ uuid, org_id: orgId, }, { $set: sets });
 

app/apollo/schema/channel.js

@@ -32,13 +32,15 @@ const channelSchema = gql`
     created: Date!
     versions: [ChannelVersion]
     subscriptions: [ChannelSubscription]
+    tags: [String!]!
   }
   type AddChannelReply {
     uuid: String!
   }
   type EditChannelReply {
     uuid: String!
     name: String!
+    tags: [String!]!
     success: Boolean
   }
   type AddChannelVersionReply {
@@ -81,6 +83,11 @@ const channelSchema = gql`
      """
      channelByName(orgId: String! @sv, name: String! @sv): Channel
 
+     """
+     Gets channels that contain all passed tags
+     """
+     channelsByTags(orgId: String! @sv, tags: [String!]!): [Channel]!
+
      """
      Gets a channel version info from this channel uuid and version uuid 
      """
@@ -96,12 +103,12 @@ const channelSchema = gql`
      """
      Adds a channel
      """
-     addChannel(orgId: String! @sv, name: String! @sv): AddChannelReply!
+     addChannel(orgId: String! @sv, name: String! @sv, tags: [String!]): AddChannelReply!
      
      """
      Edits a channel
      """
-     editChannel(orgId: String! @sv, uuid: String! @sv, name: String! @sv): EditChannelReply!
+     editChannel(orgId: String! @sv, uuid: String! @sv, name: String! @sv, tags: [String!]): EditChannelReply!
      
      """
      Adds a yaml version to this channel

app/apollo/schema/subscription.js

@@ -42,6 +42,7 @@ const subscriptionSchema = gql`
     orgId: String!
     name: String!
     groups: [String!]
+    clusterId: String
     channelUuid: String!
     channelName: String!
     channel: Channel
@@ -112,12 +113,12 @@ const subscriptionSchema = gql`
      """
      Adds a subscription
      """
-     addSubscription(orgId: String! @sv, name: String! @sv, groups: [String!]! @sv, channelUuid: String! @sv, versionUuid: String! @sv): AddChannelSubscriptionReply!
+     addSubscription(orgId: String! @sv, name: String! @sv, groups: [String!] @sv, channelUuid: String! @sv, versionUuid: String! @sv, clusterId: String @sv): AddChannelSubscriptionReply!
      
      """
      Edits a subscription
      """
-     editSubscription(orgId: String! @sv, uuid: String! @sv, name: String! @sv, groups: [String!]! @sv, channelUuid: String! @sv, versionUuid: String! @sv): EditChannelSubscriptionReply!
+     editSubscription(orgId: String! @sv, uuid: String! @sv, name: String! @sv, groups: [String!]! @sv, channelUuid: String! @sv, versionUuid: String! @sv, clusterId: String  @sv): EditChannelSubscriptionReply!
      
      """
      Set a configurationVersion

app/apollo/utils/applyQueryFields.js

@@ -182,6 +182,12 @@ const applyQueryFieldsToChannels = async(channels, queryFields={}, args, context
   const { models, me } = context;
   var { orgId } = args;
 
+  _.each(channels, (channel)=>{
+    if(!channel.tags){
+      channel.tags = [];
+    }
+  });
+
   if(queryFields.subscriptions){
     //piggyback basic-info of subscriptions associated with this channel that user allowed to see
     const conditions = await getGroupConditions(me, orgId, ACTIONS.READ, 'name', 'applyQueryFieldsToChannels queryFields.subscriptions', context);