[usage] Join workspace instances with workspaces to get project and type #11312
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
roboquat
added
release-note-none
and removed
do-not-merge/release-note-label-needed
labels
Comment on lines
+21
to
+26
| workspace := dbtest.CreateWorkspaces(t, conn, dbtest.NewWorkspace(t, db.Workspace{}))[0] | ||
|
|
||
| valid := []db.WorkspaceInstance{ | ||
| // In the middle of May | ||
| dbtest.NewWorkspaceInstance(t, db.WorkspaceInstance{ | ||
| WorkspaceID: workspaceID, | ||
| WorkspaceID: workspace.ID, |
There was a problem hiding this comment.
Was this change necessary or just tidying up?
There was a problem hiding this comment.
To ensure the joining works correctly, we needed to create an actual Workspace record in the DB (line 21). That Workspace gets a random ID each time, so it's references here.
Aside, getting a random ID is a good thing, as it allows tests against the DB to run concurrently without interfering with each other.
Comment on lines
+64
to
+72
| Table(fmt.Sprintf("%s as wsi", (&WorkspaceInstance{}).TableName())). | ||
| Select("wsi.id as id, ws.projectId as projectId, ws.type as workspaceType, wsi.workspaceClass as workspaceClass, wsi.usageAttributionId as usageAttributionId, wsi.stoppedTime as stoppedTime, wsi.creationTime as creationTime"). | ||
| Joins(fmt.Sprintf("LEFT JOIN %s AS ws ON wsi.workspaceId = ws.id", (&Workspace{}).TableName())). | ||
| Where( | ||
| conn.Where("stoppedTime >= ?", TimeToISO8601(from)).Or("stoppedTime = ?", ""), | ||
| conn.Where("wsi.stoppedTime >= ?", TimeToISO8601(from)).Or("wsi.stoppedTime = ?", ""), | ||
| ). | ||
| Where("creationTime < ?", TimeToISO8601(to)). | ||
| Where("startedTime != ?", ""). | ||
| Where("usageAttributionId != ?", ""). | ||
| Where("wsi.creationTime < ?", TimeToISO8601(to)). | ||
| Where("wsi.startedTime != ?", ""). | ||
| Where("wsi.usageAttributionId != ?", ""). |
There was a problem hiding this comment.
Do we need to test this query against larger data sets to see how it performs, or happy to deploy to prod as is?
There was a problem hiding this comment.
I can give it a go against prod data
andrew-farries
approved these changes
Jul 12, 2022
roboquat
added
deployed: webapp
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Description
Such that our usage reporting can display information about workspace instances and their type.
Related Issue(s)
Part of #10985
How to test
Unit tests
Release Notes
Documentation
NONE
Werft options: