@brimble/models 3.8.14 → 3.8.16

package/dist/index.d.ts

@@ -58,7 +58,8 @@ export { default as SandboxImage } from "./sandbox-image";
 export { default as SandboxSnapshot } from "./sandbox-snapshot";
 export { default as SandboxSnapshotUsageSegment } from "./sandbox-snapshot-usage-segment";
 export { default as SandboxUsageSegment } from "./sandbox-usage-segment";
-export { IUser, IGit, IProject, IProjectAnalytics, IPreview, IProjectConnection, IFollowing, IIntegration, IEnv, IServer, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard, IDns, IRole, IPermission, IMemberPermission, IWallet, IDbImage, IJob, ILicense, IPlanConfiguration, IAutoScalingGroup, IComputeChange, IRegion, IVolume, IFramework, BrimbleFrameworkType, ISettings, ILoadBalancerPort, IDomainRenewal, IDomainTransfer, IWebhookCategory, IWebhookEvent, IWebhookSetting, IIntention, IProvider, ICollabAnnotation, ICollabComment, ICollabAttachment, ICollabIntegration, ICollabSettings, ICollabShareToken, ICollabPushSubscription, IAppMessage, IInvoice, ITag, IProjectTagAssignment, ICashierSubscription, ICashierSubscriptionItem, IProjectEnvironment, IEnvironmentVariable, IActivityLog, IOwnershipTransfer, ISandbox, ISandboxSpecs, ISandboxImage, ISandboxSnapshot, ISandboxSnapshotUsageSegment, ISandboxSnapshotUsageSegmentCosts, ISandboxUsageSegment, ISandboxUsageSegmentCurrent, ISandboxUsageSegmentCosts, } from "./types";
+export { default as VolumeUsageSegment } from "./volume-usage-segment";
+export { IUser, IGit, IProject, IProjectAnalytics, IPreview, IProjectConnection, IFollowing, IIntegration, IEnv, IServer, IDomain, IToken, IMember, ITeam, IInstalledIntegration, ILog, ISubscription, ICard, IDns, IRole, IPermission, IMemberPermission, IWallet, IDbImage, IJob, ILicense, IPlanConfiguration, IAutoScalingGroup, IComputeChange, IRegion, IVolume, IFramework, BrimbleFrameworkType, ISettings, ILoadBalancerPort, IDomainRenewal, IDomainTransfer, IWebhookCategory, IWebhookEvent, IWebhookSetting, IIntention, IProvider, ICollabAnnotation, ICollabComment, ICollabAttachment, ICollabIntegration, ICollabSettings, ICollabShareToken, ICollabPushSubscription, IAppMessage, IInvoice, ITag, IProjectTagAssignment, ICashierSubscription, ICashierSubscriptionItem, IProjectEnvironment, IEnvironmentVariable, IActivityLog, IOwnershipTransfer, ISandbox, ISandboxSpecs, ISandboxImage, ISandboxSnapshot, ISandboxSnapshotUsageSegment, ISandboxSnapshotUsageSegmentCosts, ISandboxUsageSegment, ISandboxUsageSegmentCurrent, ISandboxUsageSegmentCosts, IVolumeUsageSegment, IVolumeUsageSegmentCosts, } from "./types";
 export { GIT_TYPE, INTEGRATION_TYPES, INTEGRATION_PROVIDERS, OAUTH_PERMISSIONS, ENVIRONMENT, SERVER_STATUS, ROLES, SUBSCRIPTION_PLAN_TYPE, PROJECT_STATUS, SUBSCRIPTION_STATUS, CARD_TYPES, DNS_TYPE, PERMISSION_TYPE, REQUEST_TYPE, ServiceType, DatabaseEngine, JobStatus, LicenseStatus, REGION_CONTINENT, BUILD_DISABLED_BY, SERVER_PROTOCOL, FrameworkApplicationType, DomainRenewalStatus, DomainTransferProvider, DomainTransferDirection, DomainTransferStatus, NomadDeploymentStatus, COLLAB_ANNOTATION_STATUS, COLLAB_INTEGRATION_TYPE, COLLAB_THEME, COLLAB_TOOLBAR_POSITION, INVOICE_STATUS, INVOICE_PAYMENT_STATUS, INVOICE_TYPE, SANDBOX_TEMPLATE, SANDBOX_STATUS, SANDBOX_DESTROY_REASON, SANDBOX_SNAPSHOT_STATUS, } from "./enum";
 import mongoose from "mongoose";
 export declare const connectToMongo: (mongoUrl: string, config?: mongoose.ConnectOptions) => Promise<void>;

package/dist/index.js

@@ -13,8 +13,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ProjectTagAssignment = exports.Tag = exports.Invoice = exports.AppMessage = exports.CollabPushSubscription = exports.CollabShareToken = exports.CollabSettings = exports.CollabIntegration = exports.CollabComment = exports.CollabAnnotation = exports.Provider = exports.Intention = exports.WebhookSetting = exports.WebhookEvent = exports.WebhookCategory = exports.DomainTransfer = exports.DomainRenewal = exports.LoadBalancerPort = exports.Settings = exports.Framework = exports.Volume = exports.Region = exports.ComputeChange = exports.AutoScalingGroup = exports.PlanConfiguration = exports.Liscense = exports.Job = exports.DbImage = exports.Wallet = exports.Server = exports.Card = exports.Subscription = exports.Log = exports.Role = exports.MemberPermission = exports.Permission = exports.Member = exports.Team = exports.Token = exports.Env = exports.Dns = exports.Domain = exports.Integration = exports.Following = exports.ProjectConnection = exports.Preview = exports.ProjectAnalytics = exports.DeletedProject = exports.Project = exports.User = void 0;
-exports.connectToMongo = exports.SANDBOX_SNAPSHOT_STATUS = exports.SANDBOX_DESTROY_REASON = exports.SANDBOX_STATUS = exports.SANDBOX_TEMPLATE = exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SERVER_PROTOCOL = exports.BUILD_DISABLED_BY = exports.REGION_CONTINENT = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REQUEST_TYPE = exports.PERMISSION_TYPE = exports.DNS_TYPE = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.SUBSCRIPTION_PLAN_TYPE = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.SandboxUsageSegment = exports.SandboxSnapshotUsageSegment = exports.SandboxSnapshot = exports.SandboxImage = exports.Sandbox = exports.OwnershipTransfer = exports.ActivityLog = exports.EnvironmentVariable = exports.ProjectEnvironment = exports.CashierSubscriptionItem = exports.CashierSubscription = void 0;
-exports.healthCheckMongo = exports.closeMongo = exports.db = void 0;
+exports.SANDBOX_SNAPSHOT_STATUS = exports.SANDBOX_DESTROY_REASON = exports.SANDBOX_STATUS = exports.SANDBOX_TEMPLATE = exports.INVOICE_TYPE = exports.INVOICE_PAYMENT_STATUS = exports.INVOICE_STATUS = exports.COLLAB_TOOLBAR_POSITION = exports.COLLAB_THEME = exports.COLLAB_INTEGRATION_TYPE = exports.COLLAB_ANNOTATION_STATUS = exports.NomadDeploymentStatus = exports.DomainTransferStatus = exports.DomainTransferDirection = exports.DomainTransferProvider = exports.DomainRenewalStatus = exports.FrameworkApplicationType = exports.SERVER_PROTOCOL = exports.BUILD_DISABLED_BY = exports.REGION_CONTINENT = exports.LicenseStatus = exports.JobStatus = exports.DatabaseEngine = exports.ServiceType = exports.REQUEST_TYPE = exports.PERMISSION_TYPE = exports.DNS_TYPE = exports.CARD_TYPES = exports.SUBSCRIPTION_STATUS = exports.PROJECT_STATUS = exports.SUBSCRIPTION_PLAN_TYPE = exports.ROLES = exports.SERVER_STATUS = exports.ENVIRONMENT = exports.OAUTH_PERMISSIONS = exports.INTEGRATION_PROVIDERS = exports.INTEGRATION_TYPES = exports.GIT_TYPE = exports.VolumeUsageSegment = exports.SandboxUsageSegment = exports.SandboxSnapshotUsageSegment = exports.SandboxSnapshot = exports.SandboxImage = exports.Sandbox = exports.OwnershipTransfer = exports.ActivityLog = exports.EnvironmentVariable = exports.ProjectEnvironment = exports.CashierSubscriptionItem = exports.CashierSubscription = void 0;
+exports.healthCheckMongo = exports.closeMongo = exports.db = exports.connectToMongo = void 0;
 var user_1 = require("./user");
 Object.defineProperty(exports, "User", { enumerable: true, get: function () { return __importDefault(user_1).default; } });
 var project_1 = require("./project");
@@ -136,6 +136,8 @@ var sandbox_snapshot_usage_segment_1 = require("./sandbox-snapshot-usage-segment
 Object.defineProperty(exports, "SandboxSnapshotUsageSegment", { enumerable: true, get: function () { return __importDefault(sandbox_snapshot_usage_segment_1).default; } });
 var sandbox_usage_segment_1 = require("./sandbox-usage-segment");
 Object.defineProperty(exports, "SandboxUsageSegment", { enumerable: true, get: function () { return __importDefault(sandbox_usage_segment_1).default; } });
+var volume_usage_segment_1 = require("./volume-usage-segment");
+Object.defineProperty(exports, "VolumeUsageSegment", { enumerable: true, get: function () { return __importDefault(volume_usage_segment_1).default; } });
 var enum_1 = require("./enum");
 Object.defineProperty(exports, "GIT_TYPE", { enumerable: true, get: function () { return enum_1.GIT_TYPE; } });
 Object.defineProperty(exports, "INTEGRATION_TYPES", { enumerable: true, get: function () { return enum_1.INTEGRATION_TYPES; } });

package/dist/sandbox.js

@@ -107,6 +107,15 @@ const sandboxSchema = new mongoose_1.Schema({
         ref: "SandboxSnapshot",
         default: null,
     },
+    snapshot_mode: {
+        type: String,
+        enum: ["automatic", "manual"],
+        default: "manual",
+    },
+    snapshot_frequency: {
+        type: String,
+        default: null,
+    },
     isDeleted: {
         type: Boolean,
         default: false,

package/dist/types/index.d.ts

@@ -59,3 +59,4 @@ export type { ISandboxImage } from "./sandbox-image";
 export type { ISandboxSnapshot } from "./sandbox-snapshot";
 export type { ISandboxSnapshotUsageSegment, ISandboxSnapshotUsageSegmentCosts, } from "./sandbox-snapshot-usage-segment";
 export type { ISandboxUsageSegment, ISandboxUsageSegmentCurrent, ISandboxUsageSegmentCosts, } from "./sandbox-usage-segment";
+export type { IVolumeUsageSegment, IVolumeUsageSegmentCosts, } from "./volume-usage-segment";

package/dist/types/sandbox.d.ts

@@ -33,5 +33,7 @@ export interface ISandbox extends Document {
     paused_at: Date | null;
     image_override: string | null;
     from_snapshot: Types.ObjectId | null;
+    snapshot_mode: "automatic" | "manual";
+    snapshot_frequency: string | null;
     isDeleted: boolean;
 }

package/dist/types/volume-usage-segment.d.ts

@@ -0,0 +1,16 @@
+import { Document, Types } from "mongoose";
+export interface IVolumeUsageSegmentCosts {
+    startDate: Date;
+    endDate: Date | null;
+}
+export interface IVolumeUsageSegment extends Document {
+    _id: Types.ObjectId;
+    volume_id: Types.ObjectId;
+    user_id: Types.ObjectId;
+    team_id: Types.ObjectId | null;
+    size_gb: number;
+    costs: IVolumeUsageSegmentCosts;
+    billed: boolean;
+    createdAt: Date;
+    updatedAt: Date;
+}

package/dist/types/volume-usage-segment.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/dist/types/volume.d.ts

@@ -1,14 +1,17 @@
-import { Document } from "mongoose";
+import { Document, Types } from "mongoose";
 import { IUser } from "./user";
 import { ITeam } from "./team";
-import { ISubscription } from "./subscription";
 export interface IVolume extends Document {
     name: string;
     user?: IUser;
     team?: ITeam;
-    subscription: ISubscription;
     size: number;
     mount_path?: string;
+    csi_volume_id: string | null;
+    region: string | null;
+    attached_sandbox_id: Types.ObjectId | null;
+    attached_project_id: Types.ObjectId | null;
+    last_attached_at: Date | null;
     created_at?: Date;
     updated_at?: Date;
 }

package/dist/volume-usage-segment.d.ts

@@ -0,0 +1,30 @@
+/// <reference types="mongoose/types/aggregate" />
+/// <reference types="mongoose/types/callback" />
+/// <reference types="mongoose/types/collection" />
+/// <reference types="mongoose/types/connection" />
+/// <reference types="mongoose/types/cursor" />
+/// <reference types="mongoose/types/document" />
+/// <reference types="mongoose/types/error" />
+/// <reference types="mongoose/types/expressions" />
+/// <reference types="mongoose/types/helpers" />
+/// <reference types="mongoose/types/middlewares" />
+/// <reference types="mongoose/types/indexes" />
+/// <reference types="mongoose/types/models" />
+/// <reference types="mongoose/types/mongooseoptions" />
+/// <reference types="mongoose/types/pipelinestage" />
+/// <reference types="mongoose/types/populate" />
+/// <reference types="mongoose/types/query" />
+/// <reference types="mongoose/types/schemaoptions" />
+/// <reference types="mongoose/types/schematypes" />
+/// <reference types="mongoose/types/session" />
+/// <reference types="mongoose/types/types" />
+/// <reference types="mongoose/types/utility" />
+/// <reference types="mongoose/types/validation" />
+/// <reference types="mongoose/types/virtuals" />
+/// <reference types="mongoose" />
+/// <reference types="mongoose/types/inferschematype" />
+import { IVolumeUsageSegment } from "./types/volume-usage-segment";
+declare const _default: import("mongoose").Model<IVolumeUsageSegment, {}, {}, {}, import("mongoose").Document<unknown, {}, IVolumeUsageSegment> & IVolumeUsageSegment & Required<{
+    _id: import("mongoose").Types.ObjectId;
+}>, any>;
+export default _default;

package/dist/volume-usage-segment.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const mongoose_1 = require("mongoose");
+const volumeUsageSegmentSchema = new mongoose_1.Schema({
+    volume_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Volume",
+        required: true,
+    },
+    user_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "User",
+        required: true,
+        index: true,
+    },
+    team_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Team",
+        default: null,
+        index: true,
+    },
+    size_gb: {
+        type: Number,
+        default: 0,
+    },
+    costs: {
+        startDate: { type: Date, required: true },
+        endDate: { type: Date, default: null },
+    },
+    billed: {
+        type: Boolean,
+        default: false,
+        index: true,
+    },
+}, {
+    timestamps: true,
+});
+volumeUsageSegmentSchema.index({ user_id: 1, billed: 1, "costs.endDate": 1 });
+volumeUsageSegmentSchema.index({ team_id: 1, billed: 1, "costs.endDate": 1 });
+volumeUsageSegmentSchema.index({ volume_id: 1, "costs.endDate": 1 });
+// Partial unique: at most one open (endDate: null) segment per volume.
+// The provider relies on E11000 keyPattern.volume_id to detect race-condition duplicates.
+volumeUsageSegmentSchema.index({ volume_id: 1 }, {
+    unique: true,
+    partialFilterExpression: { "costs.endDate": null },
+    name: "unique_open_segment_per_volume",
+});
+exports.default = (0, mongoose_1.model)("VolumeUsageSegment", volumeUsageSegmentSchema, "volume_usage_segments");

package/dist/volume.js

@@ -15,13 +15,21 @@ const volumeSchema = new mongoose_1.Schema({
         ref: "Team",
         default: null,
     },
-    subscription: {
-        type: mongoose_1.Schema.Types.ObjectId,
-        required: true,
-        ref: "Subscription",
-    },
     size: { type: Number, required: true },
     mount_path: { type: String },
+    csi_volume_id: { type: String, default: null },
+    region: { type: String, default: null },
+    attached_sandbox_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Sandbox",
+        default: null,
+    },
+    attached_project_id: {
+        type: mongoose_1.Schema.Types.ObjectId,
+        ref: "Project",
+        default: null,
+    },
+    last_attached_at: { type: Date, default: null },
 }, {
     timestamps: {
         createdAt: "created_at",

package/index.ts

@@ -58,6 +58,7 @@ export { default as SandboxImage } from "./sandbox-image";
 export { default as SandboxSnapshot } from "./sandbox-snapshot";
 export { default as SandboxSnapshotUsageSegment } from "./sandbox-snapshot-usage-segment";
 export { default as SandboxUsageSegment } from "./sandbox-usage-segment";
+export { default as VolumeUsageSegment } from "./volume-usage-segment";
 
 export {
   IUser,
@@ -128,6 +129,8 @@ export {
   ISandboxUsageSegment,
   ISandboxUsageSegmentCurrent,
   ISandboxUsageSegmentCosts,
+  IVolumeUsageSegment,
+  IVolumeUsageSegmentCosts,
 } from "./types";
 export {
   GIT_TYPE,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@brimble/models",
-  "version": "3.8.14",
+  "version": "3.8.16",
   "description": "Brimble models",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",

package/sandbox.ts

@@ -107,6 +107,15 @@ const sandboxSchema: Schema = new Schema({
     ref: "SandboxSnapshot",
     default: null,
   },
+  snapshot_mode: {
+    type: String,
+    enum: ["automatic", "manual"],
+    default: "manual",
+  },
+  snapshot_frequency: {
+    type: String,
+    default: null,
+  },
   isDeleted: {
     type: Boolean,
     default: false,

package/types/index.ts

@@ -66,3 +66,7 @@ export type {
   ISandboxUsageSegmentCurrent,
   ISandboxUsageSegmentCosts,
 } from "./sandbox-usage-segment";
+export type {
+  IVolumeUsageSegment,
+  IVolumeUsageSegmentCosts,
+} from "./volume-usage-segment";

package/types/sandbox.ts

@@ -35,5 +35,7 @@ export interface ISandbox extends Document {
   paused_at: Date | null;
   image_override: string | null;
   from_snapshot: Types.ObjectId | null;
+  snapshot_mode: "automatic" | "manual";
+  snapshot_frequency: string | null;
   isDeleted: boolean;
 }

package/types/volume-usage-segment.ts

@@ -0,0 +1,18 @@
+import { Document, Types } from "mongoose";
+
+export interface IVolumeUsageSegmentCosts {
+  startDate: Date;
+  endDate: Date | null;
+}
+
+export interface IVolumeUsageSegment extends Document {
+  _id: Types.ObjectId;
+  volume_id: Types.ObjectId;
+  user_id: Types.ObjectId;
+  team_id: Types.ObjectId | null;
+  size_gb: number;
+  costs: IVolumeUsageSegmentCosts;
+  billed: boolean;
+  createdAt: Date;
+  updatedAt: Date;
+}

package/types/volume.ts

@@ -1,15 +1,18 @@
-import { Document } from "mongoose";
+import { Document, Types } from "mongoose";
 import { IUser } from "./user";
 import { ITeam } from "./team";
-import { ISubscription } from "./subscription";
 
 export interface IVolume extends Document {
   name: string;
   user?: IUser;
   team?: ITeam;
-  subscription: ISubscription;
   size: number;
   mount_path?: string;
+  csi_volume_id: string | null;
+  region: string | null;
+  attached_sandbox_id: Types.ObjectId | null;
+  attached_project_id: Types.ObjectId | null;
+  last_attached_at: Date | null;
   created_at?: Date;
   updated_at?: Date;
 }

package/volume-usage-segment.ts

@@ -0,0 +1,61 @@
+import { model, Schema } from "mongoose";
+import { IVolumeUsageSegment } from "./types/volume-usage-segment";
+
+const volumeUsageSegmentSchema = new Schema<IVolumeUsageSegment>(
+  {
+    volume_id: {
+      type: Schema.Types.ObjectId,
+      ref: "Volume",
+      required: true,
+    },
+    user_id: {
+      type: Schema.Types.ObjectId,
+      ref: "User",
+      required: true,
+      index: true,
+    },
+    team_id: {
+      type: Schema.Types.ObjectId,
+      ref: "Team",
+      default: null,
+      index: true,
+    },
+    size_gb: {
+      type: Number,
+      default: 0,
+    },
+    costs: {
+      startDate: { type: Date, required: true },
+      endDate: { type: Date, default: null },
+    },
+    billed: {
+      type: Boolean,
+      default: false,
+      index: true,
+    },
+  },
+  {
+    timestamps: true,
+  },
+);
+
+volumeUsageSegmentSchema.index({ user_id: 1, billed: 1, "costs.endDate": 1 });
+volumeUsageSegmentSchema.index({ team_id: 1, billed: 1, "costs.endDate": 1 });
+volumeUsageSegmentSchema.index({ volume_id: 1, "costs.endDate": 1 });
+
+// Partial unique: at most one open (endDate: null) segment per volume.
+// The provider relies on E11000 keyPattern.volume_id to detect race-condition duplicates.
+volumeUsageSegmentSchema.index(
+  { volume_id: 1 },
+  {
+    unique: true,
+    partialFilterExpression: { "costs.endDate": null },
+    name: "unique_open_segment_per_volume",
+  },
+);
+
+export default model<IVolumeUsageSegment>(
+  "VolumeUsageSegment",
+  volumeUsageSegmentSchema,
+  "volume_usage_segments",
+);

package/volume.ts

@@ -17,13 +17,21 @@ const volumeSchema: Schema = new Schema(
       ref: "Team",
       default: null,
     },
-    subscription: {
-      type: Schema.Types.ObjectId,
-      required: true,
-      ref: "Subscription",
-    },
     size: { type: Number, required: true },
     mount_path: { type: String },
+    csi_volume_id: { type: String, default: null },
+    region: { type: String, default: null },
+    attached_sandbox_id: {
+      type: Schema.Types.ObjectId,
+      ref: "Sandbox",
+      default: null,
+    },
+    attached_project_id: {
+      type: Schema.Types.ObjectId,
+      ref: "Project",
+      default: null,
+    },
+    last_attached_at: { type: Date, default: null },
   },
   {
     timestamps: {