Feature/disallow invalid assignment names, join on assignment accept (KHO-311, KHO-242, KHO-310)

backend/database/migrations/001_khouryclassroom.sql

@@ -63,7 +63,8 @@ CREATE TABLE IF NOT EXISTS assignment_base_repos (
     base_repo_id INTEGER PRIMARY KEY,
     base_repo_owner VARCHAR(255) NOT NULL,
     base_repo_name VARCHAR(255) NOT NULL,
-    created_at TIMESTAMP DEFAULT (NOW() AT TIME ZONE 'UTC')
+    created_at TIMESTAMP DEFAULT (NOW() AT TIME ZONE 'UTC'),
+    initialized BOOLEAN DEFAULT FALSE NOT NULL
 );
 
 CREATE TABLE IF NOT EXISTS rubrics (

backend/internal/github/github.go

@@ -25,8 +25,6 @@ type GitHubAppClient interface { // All methods in the APP client
 	// Add a repository permission to a user
 	AssignPermissionToUser(ctx context.Context, ownerName string, repoName string, userName string, permission string) error
 
-	CreateDeadlineEnforcement(ctx context.Context, deadline *time.Time, orgName, repoName, branchName string) error
-
 	// Create instance of template repository
 	CreateRepoFromTemplate(ctx context.Context, orgName, templateRepoName, newRepoName string) (*models.AssignmentBaseRepo, error)
 }
@@ -52,6 +50,12 @@ type GitHubUserClient interface { // All methods in the OAUTH client
 	// Fork a repository as a student
 	ForkRepository(ctx context.Context, srcOwner, srcRepo, dstOrg, dstRepo string) error
 
+	// Set a branch to a specific commit
+	SetBranchToCommit(ctx context.Context, owner, repo, branch, sha string) error
+
+	// Sync a fork with its upstream repository
+	SyncForkWithUpstream(ctx context.Context, owner, repo, branch string) error
+
 	// Create initial feedback pull request
 	CreateFeedbackPR(ctx context.Context, owner, repo string) error
 }
@@ -158,4 +162,9 @@ type GitHubBaseClient interface { //All methods in the SHARED client
 	EnableWorkflow(ctx context.Context, repoOwner, forkName, workflowName string) error
 
 	EnableActions(ctx context.Context, ownerName, repoName string) error
+
+	// Check if a file or directory exists in a repository
+	FileExists(owner string, repo string, path string) (bool, error)
+
+	CreateDeadlineEnforcement(ctx context.Context, deadline *time.Time, orgName, repoName, branchName string) error
 }

backend/internal/github/sharedclient/sharedclient.go

@@ -5,6 +5,7 @@ import (
 	"encoding/base64"
 	"fmt"
 	"time"
+
 	"github.com/CamPlume1/khoury-classroom/internal/errs"
 	"github.com/CamPlume1/khoury-classroom/internal/models"
 	"github.com/google/go-github/github"
@@ -78,6 +79,11 @@ func (api *CommonAPI) getBranchHead(ctx context.Context, owner, repo, branchName
 	return &branchRef, nil
 }
 
+func (api *CommonAPI) GetBranches(ctx context.Context, owner, repo string) ([]*github.Branch, error) {
+	branches, _, err := api.Client.Repositories.ListBranches(ctx, owner, repo, nil)
+	return branches, err
+}
+
 func (api *CommonAPI) CreateBranch(ctx context.Context, owner, repo, baseBranch, newBranchName string) (*github.Reference, error) {
 	endpoint := fmt.Sprintf("/repos/%s/%s/git/refs", owner, repo)
 
@@ -196,8 +202,6 @@ func (api *CommonAPI) GetUser(ctx context.Context, userName string) (*github.Use
 	return user, err
 }
 
-
-
 func (api *CommonAPI) createRuleSet(ctx context.Context, ruleset interface{}, orgName, repoName string) error {
 	endpoint := fmt.Sprintf("/repos/%s/%s/rulesets", orgName, repoName)
 	req, err := api.Client.NewRequest("POST", endpoint, ruleset)
@@ -208,7 +212,7 @@ func (api *CommonAPI) createRuleSet(ctx context.Context, ruleset interface{}, or
 	return err
 }
 
-//Given a repo name and org name, create a push ruleset to protect the .github directory
+// Given a repo name and org name, create a push ruleset to protect the .github directory
 func (api *CommonAPI) CreatePushRuleset(ctx context.Context, orgName, repoName string) error {
 	body := map[string]interface{}{
 		"name":        "Restrict .github Directory Edits: Preserves Submission Deadline",
@@ -226,12 +230,10 @@ func (api *CommonAPI) CreatePushRuleset(ctx context.Context, orgName, repoName s
 	return api.createRuleSet(ctx, body, orgName, repoName)
 }
 
-
-
-func (api *CommonAPI) CreateBranchRuleset(ctx context.Context,  orgName, repoName string) error {
+func (api *CommonAPI) CreateBranchRuleset(ctx context.Context, orgName, repoName string) error {
 	body := map[string]interface{}{
-		"name": "Feedback and Main Branch Protedtion: PR Enforcement",
-		"target": "branch",
+		"name":        "Feedback and Main Branch Protedtion: PR Enforcement",
+		"target":      "branch",
 		"enforcement": "active",
 		"conditions": map[string]interface{}{
 			"ref_name": map[string]interface{}{
@@ -246,72 +248,63 @@ func (api *CommonAPI) CreateBranchRuleset(ctx context.Context,  orgName, repoNam
 
 			// KHO-315
 			/*
-			map[string]interface{}{
-				"type": "deletion",
-			},
+				map[string]interface{}{
+					"type": "deletion",
+				},
 			*/
 			/*
-			map[string]interface{}{
-				"type": "update",
-				"parameters": map[string]interface{}{
-				  "update_allows_fetch_and_merge": true,
-				},
-			  },
-			  */
+				map[string]interface{}{
+					"type": "update",
+					"parameters": map[string]interface{}{
+					  "update_allows_fetch_and_merge": true,
+					},
+				  },
+			*/
 			map[string]interface{}{
 				"type": "pull_request",
-				"parameters" : map[string]interface{}{
-								"required_approving_review_count": 0,
-        						"dismiss_stale_reviews_on_push": true,
-       							"require_code_owner_review": false,
-        						"require_last_push_approval": false,
-        						"required_review_thread_resolution": false,
-       							"automatic_copilot_code_review_enabled": false,
+				"parameters": map[string]interface{}{
+					"required_approving_review_count":       0,
+					"dismiss_stale_reviews_on_push":         true,
+					"require_code_owner_review":             false,
+					"require_last_push_approval":            false,
+					"required_review_thread_resolution":     false,
+					"automatic_copilot_code_review_enabled": false,
 				},
 			},
 			map[string]interface{}{
 				"type": "required_status_checks",
 				"parameters": map[string]interface{}{
 					"strict_required_status_checks_policy": false,
-					"do_not_enforce_on_create": false,
+					"do_not_enforce_on_create":             false,
 					"required_status_checks": []map[string]string{
-						map[string]string{
+						{
 							"context": "deadline-enforcement",
 						},
-						map[string]string{
+						{
 							"context": "check-pr-target-branch",
 						},
-
 					},
-
 				},
 			},
 		},
 	}
 	return api.createRuleSet(ctx, body, orgName, repoName)
 }
 
-
-
-
-
 func (api *CommonAPI) CreateDeadlineEnforcement(ctx context.Context, deadline *time.Time, orgName, repoName, branchName string) error {
 	addition := models.RepositoryAddition{
-		FilePath: ".github/workflows/deadline-enforcement.yml",
-		RepoName: repoName,
-		OwnerName: orgName,
+		FilePath:          ".github/workflows/deadline-enforcement.yml",
+		RepoName:          repoName,
+		OwnerName:         orgName,
 		DestinationBranch: branchName,
-		Content: actionWithDeadline(repoName),
-		CommitMessage: "Deadline enforcement GH action files",
+		Content:           actionWithDeadline(),
+		CommitMessage:     "Deadline enforcement GH action files",
 	}
 	return api.EditRepository(ctx, &addition)
-
 }
 
-
-func actionWithDeadline(repoName string) string {
-	fmt.Printf(repoName)
-    var scriptString = `name: deadline-enforcement
+func actionWithDeadline() string {
+	var scriptString = `name: deadline-enforcement
 
 on:
   pull_request:
@@ -345,13 +338,12 @@ jobs:
             echo "::warning::Unexpected response: $CONTENT"
             exit 1
           fi`
-    
-    return scriptString
+
+	return scriptString
 }
-
-
-  func targetBranchProtectionAction() string {
-	  var actionString = `name: check-pr-target-branch
+
+func targetBranchProtectionAction() string {
+	var actionString = `name: check-pr-target-branch
 
 on:
   pull_request:
@@ -367,42 +359,64 @@ jobs:
             echo "Error: Pull requests targeting the 'feedback' branch are not allowed"
             exit 1
         fi`
-			return actionString
-  }
-
+	return actionString
+}
 
 func (api *CommonAPI) CreatePREnforcement(ctx context.Context, orgName, repoName, branchName string) error {
 
 	addition := models.RepositoryAddition{
-		FilePath: ".github/workflows/check-pr-target-branch.yml",
-		RepoName: repoName,
-		OwnerName: orgName,
+		FilePath:          ".github/workflows/check-pr-target-branch.yml",
+		RepoName:          repoName,
+		OwnerName:         orgName,
 		DestinationBranch: branchName,
-		Content: targetBranchProtectionAction(),
-		CommitMessage: "Deadline enforcement GH action files",
+		Content:           targetBranchProtectionAction(),
+		CommitMessage:     "Deadline enforcement GH action files",
 	}
 	return api.EditRepository(ctx, &addition)
 
 }
 
 func (api *CommonAPI) EditRepository(ctx context.Context, addition *models.RepositoryAddition) error {
+	// Get the current file info if it exists
 	endpoint := fmt.Sprintf("/repos/%s/%s/contents/%s", addition.OwnerName, addition.RepoName, addition.FilePath)
-	encodedContent := base64.StdEncoding.EncodeToString([]byte(addition.Content))
+	req, err := api.Client.NewRequest("GET", endpoint, nil)
+	if err != nil {
+		fmt.Println("Error getting current file info", err)
+		return err
+	}
 
+	var existingFile struct {
+		SHA string `json:"sha"`
+	}
+	_, err = api.Client.Do(ctx, req, &existingFile)
+
+	encodedContent := base64.StdEncoding.EncodeToString([]byte(addition.Content))
 	body := map[string]interface{}{
 		"message": addition.CommitMessage,
 		"content": encodedContent,
-		"branch": addition.DestinationBranch,
+		"branch":  addition.DestinationBranch,
 	}
-	req, err := api.Client.NewRequest("PUT", endpoint, body)
+
+	// If the file already exists, include its SHA
+	if err == nil && existingFile.SHA != "" {
+		body["sha"] = existingFile.SHA
+	}
+
+	// Make the update request
+	req, err = api.Client.NewRequest("PUT", endpoint, body)
 	if err != nil {
+		fmt.Println("Error creating update request", err)
 		return err
 	}
-	_, err = api.Client.Do(ctx, req, nil)
-	return err
-}
 
+	_, err = api.Client.Do(ctx, req, nil)
+	if err != nil {
+		fmt.Println("Error updating file", err)
+		return err
+	}
 
+	return nil
+}
 
 func (api *CommonAPI) InviteUserToOrganization(ctx context.Context, orgName string, userID int64) error {
 	body := map[string]interface{}{
@@ -723,7 +737,6 @@ func (api *CommonAPI) CheckForkIsReady(ctx context.Context, repo *github.Reposit
 	return len(branches) == len(srcBranches)
 }
 
-
 func (api *CommonAPI) EnableWorkflow(ctx context.Context, ownerName, repoName, workflowName string) error {
 	endpoint := fmt.Sprintf("/repos/%s/%s/actions/worflows/%s/enable", ownerName, repoName, workflowName)
 
@@ -733,17 +746,16 @@ func (api *CommonAPI) EnableWorkflow(ctx context.Context, ownerName, repoName, w
 	}
 
 	_, err = api.Client.Do(ctx, req, nil)
-	
+
 	return err
 }
 
-
 // /repos/{owner}/{repo}/actions/permissions
 func (api *CommonAPI) EnableActions(ctx context.Context, ownerName, repoName string) error {
 	endpoint := fmt.Sprintf("/repos/%s/%s/actions/permissions", ownerName, repoName)
 
 	body := map[string]interface{}{
-		"enabled": true,
+		"enabled":         true,
 		"allowed_actions": "all",
 	}
 
@@ -753,6 +765,14 @@ func (api *CommonAPI) EnableActions(ctx context.Context, ownerName, repoName str
 	}
 
 	_, err = api.Client.Do(ctx, req, nil)
-	
+
 	return err
-}
+}
+
+func (api *CommonAPI) FileExists(owner string, repo string, path string) (bool, error) {
+	fileContent, directoryContents, _, err := api.Client.Repositories.GetContents(context.Background(), owner, repo, path, nil)
+	if err != nil {
+		return false, fmt.Errorf("error fetching contents: %v", err)
+	}
+	return fileContent != nil || directoryContents != nil, nil
+}