Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024 · Nov 12, 2024 · Nov 13, 2024 · Nov 13, 2024
diff --git a/coderd/database/dbmock/dbmock.go b/coderd/database/dbmock/dbmock.go
diff --git a/coderd/database/models.go b/coderd/database/models.go
diff --git a/coderd/database/querier.go b/coderd/database/querier.go
diff --git a/coderd/database/queries.sql.go b/coderd/database/queries.sql.go
diff --git a/coderd/insights_test.go b/coderd/insights_test.go
 },
 },
 {
 name:        "twodays ago, no data",
 name:        "twodates ago, no data",
 ignoreTimes: true,
 makeRequest: func(_ []*testTemplate) codersdk.TemplateInsightsRequest {
 twoDaysAgo := time.Now().UTC().Truncate(24*time.Hour).AddDate(0, 0, -2)
 EndTime:   today,
 Interval:  codersdk.InsightsReportIntervalWeek,
 })
 assert.Error(t, err, "last report interval must have at least 6days")
 assert.Error(t, err, "last report interval must have at least 6dates")

 _, err = client.TemplateInsights(ctx, codersdk.TemplateInsightsRequest{
 StartTime: today.AddDate(0, 0, -1),
diff --git a/coderd/testdata/insights/template/parameters_two_dates_ago,_no_data.json.golden b/coderd/testdata/insights/template/parameters_two_dates_ago,_no_data.json.golden
 {
  "report": {
    "start_time": "0001-01-01T00:00:00Z",
    "end_time": "0001-01-01T00:00:00Z",
    "template_ids": [],
    "active_users": 0,
    "apps_usage": [
      {
        "template_ids": [],
        "type": "builtin",
        "display_name": "Visual Studio Code",
        "slug": "vscode",
        "icon": "/icon/code.svg",
        "seconds": 0,
        "times_used": 0
      },
      {
        "template_ids": [],
        "type": "builtin",
        "display_name": "JetBrains",
        "slug": "jetbrains",
        "icon": "/icon/intellij.svg",
        "seconds": 0,
        "times_used": 0
      },
      {
        "template_ids": [],
        "type": "builtin",
        "display_name": "Web Terminal",
        "slug": "reconnecting-pty",
        "icon": "/icon/terminal.svg",
        "seconds": 0,
        "times_used": 0
      },
      {
        "template_ids": [],
        "type": "builtin",
        "display_name": "SSH",
        "slug": "ssh",
        "icon": "/icon/terminal.svg",
        "seconds": 0,
        "times_used": 0
      },
      {
        "template_ids": [],
        "type": "builtin",
        "display_name": "SFTP",
        "slug": "sftp",
        "icon": "/icon/terminal.svg",
        "seconds": 0,
        "times_used": 0
      }
    ],
    "parameters_usage": []
  }
 }
diff --git a/coderd/workspaces.go b/coderd/workspaces.go
 // Update audit log's organization
 auditReq.UpdateOrganizationID(template.OrganizationID)

 // TODO (SasSwart): api.Authorize below is already done above. This seems redundant.
 // Should we remove this?
 // Do this upfront to save work. If this fails, the rest of the work
 // would be wasted.
 if !api.Authorize(r, policy.ActionCreate,
Original file line number	Diff line number	Diff line change
Expand Up		@@ -1212,7 +1212,7 @@ func TestTemplateInsights_Golden(t *testing.T) {
		},
		},
		{
		name: "twodays ago, no data",
		name: "twodates ago, no data",
		ignoreTimes: true,
		makeRequest: func(_ []*testTemplate) codersdk.TemplateInsightsRequest {
		twoDaysAgo := time.Now().UTC().Truncate(24*time.Hour).AddDate(0, 0, -2)
Expand DownExpand Up		@@ -2110,7 +2110,7 @@ func TestTemplateInsights_BadRequest(t *testing.T) {
		EndTime: today,
		Interval: codersdk.InsightsReportIntervalWeek,
		})
		assert.Error(t, err, "last report interval must have at least 6days")
		assert.Error(t, err, "last report interval must have at least 6dates")

		_, err = client.TemplateInsights(ctx, codersdk.TemplateInsightsRequest{
		StartTime: today.AddDate(0, 0, -1),
Expand Down
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,56 @@
		{
		"report": {
		"start_time": "0001-01-01T00:00:00Z",
		"end_time": "0001-01-01T00:00:00Z",
		"template_ids": [],
		"active_users": 0,
		"apps_usage": [
		{
		"template_ids": [],
		"type": "builtin",
		"display_name": "Visual Studio Code",
		"slug": "vscode",
		"icon": "/icon/code.svg",
		"seconds": 0,
		"times_used": 0
		},
		{
		"template_ids": [],
		"type": "builtin",
		"display_name": "JetBrains",
		"slug": "jetbrains",
		"icon": "/icon/intellij.svg",
		"seconds": 0,
		"times_used": 0
		},
		{
		"template_ids": [],
		"type": "builtin",
		"display_name": "Web Terminal",
		"slug": "reconnecting-pty",
		"icon": "/icon/terminal.svg",
		"seconds": 0,
		"times_used": 0
		},
		{
		"template_ids": [],
		"type": "builtin",
		"display_name": "SSH",
		"slug": "ssh",
		"icon": "/icon/terminal.svg",
		"seconds": 0,
		"times_used": 0
		},
		{
		"template_ids": [],
		"type": "builtin",
		"display_name": "SFTP",
		"slug": "sftp",
		"icon": "/icon/terminal.svg",
		"seconds": 0,
		"times_used": 0
		}
		],
		"parameters_usage": []
		}
		}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -517,6 +517,8 @@ func createWorkspace(
		// Update audit log's organization
		auditReq.UpdateOrganizationID(template.OrganizationID)

		// TODO (SasSwart): api.Authorize below is already done above. This seems redundant.
		// Should we remove this?
Copy link Member johnstcnNov 28, 2024 Choose a reason for hiding this comment The reason will be displayed to describe this comment to others.Learn more. Yep, that does look redundant. Let's remove it in a separate PR.
		// Do this upfront to save work. If this fails, the rest of the work
		// would be wasted.
		if !api.Authorize(r, policy.ActionCreate,
Expand Down