fix/drift settings (#2026)

* fix drift settings

* Update ee/drift/controllers/drift.go

Co-authored-by: bismuthdev[bot] <177057995+bismuthdev[bot]@users.noreply.github.com>

* fix drift settings

---------

Co-authored-by: bismuthdev[bot] <177057995+bismuthdev[bot]@users.noreply.github.com>

Author: motatoes

backend/bootstrap/main.go

@@ -231,13 +231,14 @@ func Bootstrap(templates embed.FS, diggerController controllers.DiggerController
 
 		billingApiGroup := apiGroup.Group("/billing")
 		billingApiGroup.GET("/", controllers.BillingStatusApi)
-		
+
 		reposApiGroup := apiGroup.Group("/repos")
 		reposApiGroup.GET("/", controllers.ListReposApi)
 		reposApiGroup.GET("/:repo_id/jobs", controllers.GetJobsForRepoApi)
 
 		projectsApiGroup := apiGroup.Group("/projects")
 		projectsApiGroup.GET("/", controllers.ListProjectsApi)
+		projectsApiGroup.GET("/:project_id/", controllers.ProjectsDetailsApi)
 		projectsApiGroup.PUT("/:project_id/", controllers.UpdateProjectApi)
 
 		githubApiGroup := apiGroup.Group("/github")

backend/controllers/projects.go

@@ -71,6 +71,41 @@ func ListProjectsApi(c *gin.Context) {
 	c.JSON(http.StatusOK, response)
 }
 
+func ProjectsDetailsApi(c *gin.Context) {
+	// assume all exists as validated in middleware
+	organisationId := c.GetString(middleware.ORGANISATION_ID_KEY)
+	organisationSource := c.GetString(middleware.ORGANISATION_SOURCE_KEY)
+	projectId := c.Param("project_id")
+
+	var org models.Organisation
+	err := models.DB.GormDB.Where("external_id = ? AND external_source = ?", organisationId, organisationSource).First(&org).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			slog.Info("Organisation not found", "organisationId", organisationId, "source", organisationSource)
+			c.String(http.StatusNotFound, "Could not find organisation: "+organisationId)
+		} else {
+			slog.Error("Error fetching organisation", "organisationId", organisationId, "source", organisationSource, "error", err)
+			c.String(http.StatusInternalServerError, "Error fetching organisation")
+		}
+		return
+	}
+
+	var project models.Project
+	err = models.DB.GormDB.Preload("Organisation").Where("projects.organisation_id = ? AND projects.id = ?", org.ID, projectId).First(&project).Error
+	if err != nil {
+		if errors.Is(err, gorm.ErrRecordNotFound) {
+			slog.Info("Project not found", "organisationId", organisationId, "orgId", org.ID)
+			c.String(http.StatusNotFound, "Could not find project")
+		} else {
+			slog.Error("Error fetching project", "organisationId", organisationId, "orgId", org.ID, "error", err)
+			c.String(http.StatusInternalServerError, "Unknown error occurred while fetching database")
+		}
+		return
+	}
+
+	c.JSON(http.StatusOK, project.MapToJsonStruct())
+}
+
 func UpdateProjectApi(c *gin.Context) {
 	// assume all exists as validated in middleware
 	organisationId := c.GetString(middleware.ORGANISATION_ID_KEY)

backend/models/orgs.go

@@ -116,28 +116,28 @@ type Project struct {
 }
 
 func (p *Project) MapToJsonStruct() interface{} {
-	lastRun, _ := DB.GetLastDiggerRunForProject(p.Name)
-	status := RunSucceeded
-	if lastRun != nil {
-		status = lastRun.Status
-	}
+	//lastRun, _ := DB.GetLastDiggerRunForProject(p.Name)
+	//status := RunSucceeded
+	//if lastRun != nil {
+	//	status = lastRun.Status
+	//}
 	return struct {
-		Id                    uint   `json:"id"`
-		Name                  string `json:"name"`
-		Directory             string `json:"directory"`
-		OrganisationID        uint   `json:"organisation_id"`
-		OrganisationName      string `json:"organisation_name"`
-		RepoID                uint   `json:"repo_id"`
-		RepoFullName          string `json:"repo_full_name"`
-		IsInMainBranch        bool   `json:"is_in_main_branch"`
-		IsGenerated           bool   `json:"is_generated"`
-		DriftEnabled          bool   `json:"drift_enabled"`
-		DriftStatus           string `json:"drift_status"`
-		LatestDriftCheck      string `json:"latest_drift_check"`
-		DriftTerraformPlan    string `json:"drift_terraform_plan"`
-		LastActivityTimestamp string `json:"last_activity_timestamp"`
-		LastActivityAuthor    string `json:"last_activity_author"`
-		LastActivityStatus    string `json:"last_activity_status"`
+		Id                    uint      `json:"id"`
+		Name                  string    `json:"name"`
+		Directory             string    `json:"directory"`
+		OrganisationID        uint      `json:"organisation_id"`
+		OrganisationName      string    `json:"organisation_name"`
+		RepoID                uint      `json:"repo_id"`
+		RepoFullName          string    `json:"repo_full_name"`
+		IsInMainBranch        bool      `json:"is_in_main_branch"`
+		IsGenerated           bool      `json:"is_generated"`
+		DriftEnabled          bool      `json:"drift_enabled"`
+		DriftStatus           string    `json:"drift_status"`
+		LatestDriftCheck      time.Time `json:"latest_drift_check"`
+		DriftTerraformPlan    string    `json:"drift_terraform_plan"`
+		LastActivityTimestamp string    `json:"last_activity_timestamp"`
+		LastActivityAuthor    string    `json:"last_activity_author"`
+		LastActivityStatus    string    `json:"last_activity_status"`
 	}{
 		Id:                    p.ID,
 		Name:                  p.Name,
@@ -147,13 +147,13 @@ func (p *Project) MapToJsonStruct() interface{} {
 		RepoFullName:          p.RepoFullName,
 		DriftEnabled:          p.DriftEnabled,
 		DriftStatus:           string(p.DriftStatus),
-		LatestDriftCheck:      p.LatestDriftCheck.String(),
+		LatestDriftCheck:      p.LatestDriftCheck,
 		DriftTerraformPlan:    p.DriftTerraformPlan,
 		LastActivityTimestamp: p.UpdatedAt.String(),
 		LastActivityAuthor:    "unknown",
-		LastActivityStatus:    string(status),
-		IsGenerated:           p.IsGenerated,
-		IsInMainBranch:        p.IsInMainBranch,
+		//LastActivityStatus:    string(status),
+		IsGenerated:    p.IsGenerated,
+		IsInMainBranch: p.IsInMainBranch,
 	}
 }
 func (r *Repo) MapToJsonStruct() interface{} {

ee/drift/controllers/ci_jobs.go

@@ -137,6 +137,7 @@ func ProjectDriftStateMachineApply(project models.Project, tfplan string, resour
 	project.DriftToCreate = resourcesCreated
 	project.DriftToUpdate = resourcesUpdated
 	project.DriftToDelete = resourcesDeleted
+	project.LatestDriftCheck = time.Now()
 	result := models.DB.GormDB.Save(&project)
 	if result.Error != nil {
 		return result.Error