Skip to content

Port resource-approval backend (PR #555) onto re-architected master - #715

Merged
DImuthuUpe merged 2 commits into
masterfrom
port/pr-555-resource-approval
Sep 28, 2026
Merged

DImuthuUpe merged 2 commits into
masterfrom
port/pr-555-resource-approval

Conversation

@DImuthuUpe

Copy link
Copy Markdown
Contributor

Summary

Squashed port of @ganning127's resource-approval work (originally #555) onto the re-architected apache/master, preserving authorship via Co-authored-by.

The original work lived in modules/research-framework/research-service, which no longer exists on master after the module-flattening / gRPC re-architecture. This PR relocates the Spring Boot research-service sources into airavata-api/research-service.

Included

  • AdminController + AdminHandler, ResourceController
  • ResourceVerificationActivity entity + repository
  • Resource / ResourceAuthor entities, CreateResourceRequest DTO, AuthorRoleEnum
  • ResourceHandler, DevDataInitializer

Builds on the author-roles work (#547 → ported in the companion draft PR).

⚠️ Deferred — needs maintainer reconciliation

Draft because master was rearchitected (REST/JPA → gRPC):

  1. root pom.xml / README.md not overwritten — apache's module layout kept.
  2. application.yml brought in as-is; needs reconciliation with master config.
  3. REST-vs-gRPC overlap in org.apache.airavata.research.service needs architectural reconciliation.

Supersedes #555 (which targets the removed module tree).

Squashed port of ganning127's resource-approval work (originally
PR #555, 6 commits) onto the current apache/master. Relocates the
Spring Boot research-service sources from the former
modules/research-framework/research-service into
airavata-api/research-service.

Includes: AdminController + AdminHandler, ResourceController,
ResourceVerificationActivity entity + repository, Resource/ResourceAuthor
entities, CreateResourceRequest DTO, AuthorRoleEnum, ResourceHandler and
DevDataInitializer changes. Builds on the author-roles work (PR #547).

Deferred for manual reconciliation (see PR description):
- root pom.xml / README.md not overwritten (apache module layout retained)
- application.yml brought in as-is; needs reconciliation with master config
- REST-vs-gRPC architecture overlap in org.apache.airavata.research

Co-authored-by: ganning127 <ganningxu@gmail.com>
@DImuthuUpe
DImuthuUpe marked this pull request as ready for review September 28, 2026 13:57
@DImuthuUpe
DImuthuUpe merged commit 9bc7724 into master Sep 28, 2026
4 of 6 checks passed
@DImuthuUpe DImuthuUpe mentioned this pull request Sep 28, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

1 participant