feat: add project environement and user count organization list API

api-description/web-api.swagger.yaml

@@ -3344,6 +3344,15 @@ definitions:
  format: int64
  systemAdmin:
  type: boolean
+ projectCount:
+ type: integer
+ format: int32
+ environmentCount:
+ type: integer
+ format: int32
+ userCount:
+ type: integer
+ format: int32
  environmentArchiveEnvironmentV2Command:
  type: object
  environmentArchiveEnvironmentV2Request:

pkg/environment/api/organization.go

@@ -118,16 +118,16 @@ func (s *EnvironmentService) ListOrganizations(
  }
  whereParts := []mysql.WherePart{}
  if req.Disabled != nil {
- whereParts = append(whereParts, mysql.NewFilter("disabled", "=", req.Disabled.Value))
+ whereParts = append(whereParts, mysql.NewFilter("organization.disabled", "=", req.Disabled.Value))
  }
  if req.Archived != nil {
- whereParts = append(whereParts, mysql.NewFilter("archived", "=", req.Archived.Value))
+ whereParts = append(whereParts, mysql.NewFilter("organization.archived", "=", req.Archived.Value))
  }
  if req.SearchKeyword != "" {
  whereParts = append(
  whereParts,
  mysql.NewSearchQuery(
- []string{"id", "name", "url_code"},
+ []string{"organization.id", "organization.name", "organization.url_code"},
  req.SearchKeyword,
  ),
  )
@@ -192,15 +192,15 @@ func (s *EnvironmentService) newOrganizationListOrders(
  switch orderBy {
  case environmentproto.ListOrganizationsRequest_DEFAULT,
  environmentproto.ListOrganizationsRequest_NAME:
- column = "name"
+ column = "organization.name"
  case environmentproto.ListOrganizationsRequest_URL_CODE:
- column = "url_code"
+ column = "organization.url_code"
  case environmentproto.ListOrganizationsRequest_ID:
- column = "id"
+ column = "organization.id"
  case environmentproto.ListOrganizationsRequest_CREATED_AT:
- column = "created_at"
+ column = "organization.created_at"
  case environmentproto.ListOrganizationsRequest_UPDATED_AT:
- column = "updated_at"
+ column = "organization.updated_at"
  default:
  dt, err := statusInvalidOrderBy.WithDetails(&errdetails.LocalizedMessage{
  Locale: localizer.GetLocale(),

pkg/environment/storage/v2/organization.go

@@ -200,6 +200,9 @@ func (s *organizationStorage) ListOrganizations(
  &organization.SystemAdmin,
  &organization.CreatedAt,
  &organization.UpdatedAt,
+ &organization.ProjectCount,
+ &organization.EnvironmentCount,
+ &organization.UserCount,
  )
  if err != nil {
  return nil, 0, 0, err

pkg/environment/storage/v2/sql/organization/select_organizations.sql

@@ -1,14 +1,33 @@
 SELECT
- id,
- name,
- url_code,
- description,
- disabled,
- archived,
- trial,
- system_admin,
- created_at,
- updated_at
+ organization.id,
+ organization.name,
+ organization.url_code,
+ organization.description,
+ organization.disabled,
+ organization.archived,
+ organization.trial,
+ organization.system_admin,
+ organization.created_at,
+ organization.updated_at,
+ COUNT(DISTINCT project.id) AS projects,
+ COUNT(DISTINCT environment_v2.id) AS environments,
+ COUNT(DISTINCT account_v2.email) AS users
 FROM
  organization
- %s %s %s
+LEFT JOIN project ON organization.id = project.organization_id
+LEFT JOIN environment_v2 ON organization.id = environment_v2.organization_id
+LEFT JOIN account_v2 ON organization.id = account_v2.organization_id
+%s
+GROUP BY
+ organization.id,
+ organization.name,
+ organization.url_code,
+ organization.description,
+ organization.disabled,
+ organization.archived,
+ organization.trial,
+ organization.system_admin,
+ organization.created_at,
+ organization.updated_at
+%s
+%s

proto/environment/organization.proto

@@ -28,4 +28,7 @@ message Organization {
  int64 created_at = 8;
  int64 updated_at = 9;
  bool system_admin = 10;
+ int32 project_count = 11;
+ int32 environment_count = 12;
+ int32 user_count = 13;
 }

proto/proto.lock

@@ -7521,6 +7521,21 @@
  "id": 10,
  "name": "system_admin",
  "type": "bool"
+ },
+ {
+ "id": 11,
+ "name": "project_count",
+ "type": "int32"
+ },
+ {
+ "id": 12,
+ "name": "environment_count",
+ "type": "int32"
+ },
+ {
+ "id": 13,
+ "name": "user_count",
+ "type": "int32"
  }
  ]
  }

ui/web-v2/src/proto/environment/organization_pb.d.ts

@@ -34,6 +34,15 @@ export class Organization extends jspb.Message {
  getSystemAdmin(): boolean;
  setSystemAdmin(value: boolean): void;
 
+ getProjectCount(): number;
+ setProjectCount(value: number): void;
+
+ getEnvironmentCount(): number;
+ setEnvironmentCount(value: number): void;
+
+ getUserCount(): number;
+ setUserCount(value: number): void;
+
  serializeBinary(): Uint8Array;
  toObject(includeInstance?: boolean): Organization.AsObject;
  static toObject(
@@ -67,5 +76,8 @@ export namespace Organization {
  createdAt: number;
  updatedAt: number;
  systemAdmin: boolean;
+ projectCount: number;
+ environmentCount: number;
+ userCount: number;
  };
 }

ui/web-v2/src/proto/environment/organization_pb.js

@@ -93,7 +93,10 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  trial: jspb.Message.getBooleanFieldWithDefault(msg, 7, false),
  createdAt: jspb.Message.getFieldWithDefault(msg, 8, 0),
  updatedAt: jspb.Message.getFieldWithDefault(msg, 9, 0),
- systemAdmin: jspb.Message.getBooleanFieldWithDefault(msg, 10, false)
+ systemAdmin: jspb.Message.getBooleanFieldWithDefault(msg, 10, false),
+ projectCount: jspb.Message.getFieldWithDefault(msg, 11, 0),
+ environmentCount: jspb.Message.getFieldWithDefault(msg, 12, 0),
+ userCount: jspb.Message.getFieldWithDefault(msg, 13, 0)
  };
 
  if (includeInstance) {
@@ -172,6 +175,18 @@ proto.bucketeer.environment.Organization.deserializeBinaryFromReader =
  var value = /** @type {boolean} */ (reader.readBool());
  msg.setSystemAdmin(value);
  break;
+ case 11:
+ var value = /** @type {number} */ (reader.readInt32());
+ msg.setProjectCount(value);
+ break;
+ case 12:
+ var value = /** @type {number} */ (reader.readInt32());
+ msg.setEnvironmentCount(value);
+ break;
+ case 13:
+ var value = /** @type {number} */ (reader.readInt32());
+ msg.setUserCount(value);
+ break;
  default:
  reader.skipField();
  break;
@@ -246,6 +261,18 @@ proto.bucketeer.environment.Organization.serializeBinaryToWriter = function (
  if (f) {
  writer.writeBool(10, f);
  }
+ f = message.getProjectCount();
+ if (f !== 0) {
+ writer.writeInt32(11, f);
+ }
+ f = message.getEnvironmentCount();
+ if (f !== 0) {
+ writer.writeInt32(12, f);
+ }
+ f = message.getUserCount();
+ if (f !== 0) {
+ writer.writeInt32(13, f);
+ }
 };
 
 /**
@@ -434,4 +461,63 @@ proto.bucketeer.environment.Organization.prototype.setSystemAdmin = function (
  return jspb.Message.setProto3BooleanField(this, 10, value);
 };
 
+/**
+ * optional int32 project_count = 11;
+ * @return {number}
+ */
+proto.bucketeer.environment.Organization.prototype.getProjectCount =
+ function () {
+ return /** @type {number} */ (
+ jspb.Message.getFieldWithDefault(this, 11, 0)
+ );
+ };
+
+/**
+ * @param {number} value
+ * @return {!proto.bucketeer.environment.Organization} returns this
+ */
+proto.bucketeer.environment.Organization.prototype.setProjectCount = function (
+ value
+) {
+ return jspb.Message.setProto3IntField(this, 11, value);
+};
+
+/**
+ * optional int32 environment_count = 12;
+ * @return {number}
+ */
+proto.bucketeer.environment.Organization.prototype.getEnvironmentCount =
+ function () {
+ return /** @type {number} */ (
+ jspb.Message.getFieldWithDefault(this, 12, 0)
+ );
+ };
+
+/**
+ * @param {number} value
+ * @return {!proto.bucketeer.environment.Organization} returns this
+ */
+proto.bucketeer.environment.Organization.prototype.setEnvironmentCount =
+ function (value) {
+ return jspb.Message.setProto3IntField(this, 12, value);
+ };
+
+/**
+ * optional int32 user_count = 13;
+ * @return {number}
+ */
+proto.bucketeer.environment.Organization.prototype.getUserCount = function () {
+ return /** @type {number} */ (jspb.Message.getFieldWithDefault(this, 13, 0));
+};
+
+/**
+ * @param {number} value
+ * @return {!proto.bucketeer.environment.Organization} returns this
+ */
+proto.bucketeer.environment.Organization.prototype.setUserCount = function (
+ value
+) {
+ return jspb.Message.setProto3IntField(this, 13, value);
+};
+
 goog.object.extend(exports, proto.bucketeer.environment);