Skip to content

형식에 맞지 않는 디렉토리 형태를 수정하였습니다. #181

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
agvber merged 3 commits into from
May 27, 2025
Merged

형식에 맞지 않는 디렉토리 형태를 수정하였습니다. #181

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
733ff3d
chore: authentication module package directory 수정
agvber May 26, 2025
dcc25e9
chore: database module package directory 수정
agvber May 26, 2025
a3cd967
chore: ktlinter code cleanup
agvber May 26, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion core/authentication/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ plugins {
}

android {
namespace = "com.agvber.core.authentication"
namespace = "com.teampatch.core.authentication"

buildTypes {
release {
Expand Down
2 changes: 1 addition & 1 deletion core/authentication/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<application>

<activity
android:name=".kakao.KakaoLoginHelperActivity"
android:name="com.teampatch.core.authentication.kakao.KakaoLoginHelperActivity"
android:exported="false" />

</application>
Expand Down
8 changes: 0 additions & 8 deletions core/authentication/src/main/java/com/agvber/core/authentication/SocialLoginService.kt
View file
Open in desktop

This file was deleted.

8 changes: 8 additions & 0 deletions core/authentication/src/main/java/com/teampatch/core/authentication/SocialLoginService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
package com.teampatch.core.authentication

import com.teampatch.core.authentication.model.Token

abstract class SocialLoginService {

abstract suspend fun login(): Token
}
4 changes: 2 additions & 2 deletions ...thentication/kakao/KakaoAuthentication.kt → ...thentication/kakao/KakaoAuthentication.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.agvber.core.authentication.kakao
package com.teampatch.core.authentication.kakao

import android.content.Context
import android.content.Intent
Expand All @@ -7,7 +7,7 @@ import androidx.activity.compose.rememberLauncherForActivityResult
import androidx.activity.result.ActivityResult
import androidx.activity.result.contract.ActivityResultContracts
import androidx.compose.runtime.Composable
import com.agvber.core.authentication.model.Token
import com.teampatch.core.authentication.model.Token
import com.teampatch.core.common.getCustomParcelableExtra

/**
Expand Down
4 changes: 2 additions & 2 deletions ...ication/kakao/KakaoLoginHelperActivity.kt → ...ication/kakao/KakaoLoginHelperActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
package com.agvber.core.authentication.kakao
package com.teampatch.core.authentication.kakao

import android.app.Activity
import android.content.Context
import android.content.Intent
import android.os.Bundle
import android.util.Log
import com.agvber.core.authentication.model.Token
import com.kakao.sdk.auth.model.OAuthToken
import com.kakao.sdk.user.UserApiClient
import com.kakao.sdk.user.model.User
import com.teampatch.core.authentication.model.Token

internal class KakaoLoginHelperActivity : Activity() {

Expand Down
6 changes: 3 additions & 3 deletions ...authentication/kakao/KakaoLoginService.kt → ...authentication/kakao/KakaoLoginService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.agvber.core.authentication.kakao
package com.teampatch.core.authentication.kakao

import android.content.Context
import android.content.Intent
import com.agvber.core.authentication.SocialLoginService
import com.agvber.core.authentication.model.Token
import com.teampatch.core.authentication.SocialLoginService
import com.teampatch.core.authentication.model.Token
import com.teampatch.core.common.getCustomParcelableExtra
import dagger.hilt.android.qualifiers.ApplicationContext
import javax.inject.Inject
Expand Down
2 changes: 1 addition & 1 deletion ...agvber/core/authentication/model/Token.kt → ...mpatch/core/authentication/model/Token.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.agvber.core.authentication.model
package com.teampatch.core.authentication.model

import android.os.Parcelable
import java.util.Date
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/teampatch/core/data/mapper/MemoryCardMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.teampatch.core.data.mapper

import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.harmony.core.database.model.MemoryCardEntity
import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.teampatch.core.database.model.MemoryCardEntity
import com.teampatch.core.domain.model.MemoryCard
import java.time.LocalDateTime

Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/teampatch/core/data/mapper/TodoMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.teampatch.core.data.mapper

import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.harmony.core.database.model.TodoEntity
import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.teampatch.core.database.model.TodoEntity
import com.teampatch.core.domain.model.Todo
import java.time.LocalDateTime

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/teampatch/core/data/mapper/UserMapper.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.teampatch.core.data.mapper

import com.harmony.core.database.model.UserEntity
import com.teampatch.core.database.model.UserEntity
import com.teampatch.core.domain.model.User
import com.teampatch.core.network.model.user.ProfileResponse

Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/teampatch/core/data/repository/AuthenticationRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.teampatch.core.data.repository

import com.agvber.core.authentication.kakao.KakaoLoginService
import com.teampatch.core.authentication.kakao.KakaoLoginService
import com.teampatch.core.data.utils.toServerDateFormat
import com.teampatch.core.domain.entity.TokenManager
import com.teampatch.core.domain.model.LoginResult
Expand Down
2 changes: 1 addition & 1 deletion core/data/src/main/java/com/teampatch/core/data/repository/TodoOfflineRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ package com.teampatch.core.data.repository

import androidx.paging.PagingData
import androidx.paging.map
import com.harmony.core.database.dao.TodoDao
import com.teampatch.core.data.mapper.toDomain
import com.teampatch.core.database.dao.TodoDao
import com.teampatch.core.domain.model.Todo
import com.teampatch.core.domain.repository.TodoRepository
import javax.inject.Inject
Expand Down
4 changes: 2 additions & 2 deletions ...c/main/java/com/teampatch/core/data/repository/local/LocalAuthenticationRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.teampatch.core.data.repository.local

import com.agvber.core.authentication.kakao.KakaoLoginService
import com.harmony.core.database.dao.UserDao
import com.teampatch.core.authentication.kakao.KakaoLoginService
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.domain.entity.SocialLoginHelper
import com.teampatch.core.domain.entity.TokenManager
import com.teampatch.core.domain.model.LoginResult
Expand Down
6 changes: 3 additions & 3 deletions .../main/java/com/teampatch/core/data/repository/local/LocalGroupManagementRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
package com.teampatch.core.data.repository.local

import com.harmony.core.database.dao.GroupDao
import com.harmony.core.database.dao.UserDao
import com.harmony.core.database.model.GroupEntity
import com.teampatch.core.data.mapper.roleStringMapper
import com.teampatch.core.database.dao.GroupDao
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.database.model.GroupEntity
import com.teampatch.core.domain.model.FamilyInfo
import com.teampatch.core.domain.model.InvitedGroup
import com.teampatch.core.domain.model.UserGroup
Expand Down
4 changes: 2 additions & 2 deletions ...a/src/main/java/com/teampatch/core/data/repository/local/LocalMemoryCardRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@ package com.teampatch.core.data.repository.local

import android.util.Log
import androidx.paging.PagingData
import com.harmony.core.database.dao.MemoryCardDao
import com.harmony.core.database.dao.UserDao
import com.teampatch.core.data.mapper.toDomain
import com.teampatch.core.database.dao.MemoryCardDao
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.domain.fake.FakeMemoryCardQuestion
import com.teampatch.core.domain.model.MemoryCard
import com.teampatch.core.domain.model.MemoryCardQuestion
Expand Down
10 changes: 5 additions & 5 deletions ...ata/src/main/java/com/teampatch/core/data/repository/local/LocalQuestionRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.teampatch.core.data.repository.local

import androidx.paging.PagingData
import com.harmony.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.harmony.core.database.dao.QuestionDao
import com.harmony.core.database.dao.UserDao
import com.harmony.core.database.getCurrentTimeLocalDBFormat
import com.harmony.core.database.model.QuestionCommentEntity
import com.teampatch.core.database.LOCAL_DB_DATE_TIME_FORMATTER
import com.teampatch.core.database.dao.QuestionDao
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.database.getCurrentTimeLocalDBFormat
import com.teampatch.core.database.model.QuestionCommentEntity
import com.teampatch.core.domain.model.Question
import com.teampatch.core.domain.model.QuestionComment
import com.teampatch.core.domain.model.QuestionDetail
Expand Down
4 changes: 2 additions & 2 deletions core/data/src/main/java/com/teampatch/core/data/repository/local/LocalUserRepositoryImpl.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ import android.content.Context
import android.net.Uri
import android.webkit.MimeTypeMap
import androidx.core.net.toUri
import com.harmony.core.database.dao.UserDao
import com.harmony.core.database.model.UserEntity
import com.teampatch.core.data.di.annotation.DispatchersContext
import com.teampatch.core.data.di.annotation.HarmonyDispatcher
import com.teampatch.core.data.mapper.MEMBER
import com.teampatch.core.data.mapper.VIP
import com.teampatch.core.data.mapper.toDomain
import com.teampatch.core.data.utils.getMediaStoreInfo
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.database.model.UserEntity
import com.teampatch.core.domain.entity.SocialLoginHelper
import com.teampatch.core.domain.model.Role
import com.teampatch.core.domain.model.User
Expand Down
2 changes: 1 addition & 1 deletion core/database/build.gradle.kts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ plugins {
}

android {
namespace = "com.harmony.core.database"
namespace = "com.teampatch.core.database"
}

dependencies {
Expand Down
10 changes: 0 additions & 10 deletions ...atabase/src/main/java/com/harmony/core/database/model/multimap/QuestionCommentWithUser.kt
View file
Open in desktop

This file was deleted.

26 changes: 13 additions & 13 deletions .../harmony/core/database/HarmonyDatabase.kt → ...eampatch/core/database/HarmonyDatabase.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,20 @@
package com.harmony.core.database
package com.teampatch.core.database

import androidx.room.Database
import androidx.room.RoomDatabase
import androidx.room.TypeConverters
import com.harmony.core.database.converters.SetStringTypeTypeConverter
import com.harmony.core.database.dao.GroupDao
import com.harmony.core.database.dao.MemoryCardDao
import com.harmony.core.database.dao.QuestionDao
import com.harmony.core.database.dao.TodoDao
import com.harmony.core.database.dao.UserDao
import com.harmony.core.database.model.GroupEntity
import com.harmony.core.database.model.MemoryCardEntity
import com.harmony.core.database.model.QuestionCommentEntity
import com.harmony.core.database.model.QuestionEntity
import com.harmony.core.database.model.TodoEntity
import com.harmony.core.database.model.UserEntity
import com.teampatch.core.database.converters.SetStringTypeTypeConverter
import com.teampatch.core.database.dao.GroupDao
import com.teampatch.core.database.dao.MemoryCardDao
import com.teampatch.core.database.dao.QuestionDao
import com.teampatch.core.database.dao.TodoDao
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.database.model.GroupEntity
import com.teampatch.core.database.model.MemoryCardEntity
import com.teampatch.core.database.model.QuestionCommentEntity
import com.teampatch.core.database.model.QuestionEntity
import com.teampatch.core.database.model.TodoEntity
import com.teampatch.core.database.model.UserEntity

@Database(
entities = [
Expand Down
2 changes: 1 addition & 1 deletion ...n/java/com/harmony/core/database/Utils.kt → ...java/com/teampatch/core/database/Utils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database
package com.teampatch.core.database

import java.time.LocalDateTime
import java.time.format.DateTimeFormatter
Expand Down
2 changes: 1 addition & 1 deletion .../database/converters/RoomTypeConverter.kt → .../database/converters/RoomTypeConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database.converters
package com.teampatch.core.database.converters

internal abstract class RoomTypeConverter<T> {
abstract fun fromObjectToJson(value: T): String
Expand Down
2 changes: 1 addition & 1 deletion .../converters/SetStringTypeTypeConverter.kt → .../converters/SetStringTypeTypeConverter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database.converters
package com.teampatch.core.database.converters

import androidx.room.TypeConverter
import com.squareup.moshi.JsonAdapter
Expand Down
4 changes: 2 additions & 2 deletions ...com/harmony/core/database/dao/GroupDao.kt → ...m/teampatch/core/database/dao/GroupDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.harmony.core.database.dao
package com.teampatch.core.database.dao

import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.Query
import com.harmony.core.database.model.GroupEntity
import com.teampatch.core.database.model.GroupEntity
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
4 changes: 2 additions & 2 deletions ...armony/core/database/dao/MemoryCardDao.kt → ...mpatch/core/database/dao/MemoryCardDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.harmony.core.database.dao
package com.teampatch.core.database.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Update
import com.harmony.core.database.model.MemoryCardEntity
import com.teampatch.core.database.model.MemoryCardEntity
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
8 changes: 4 additions & 4 deletions .../harmony/core/database/dao/QuestionDao.kt → ...eampatch/core/database/dao/QuestionDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.harmony.core.database.dao
package com.teampatch.core.database.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Update
import com.harmony.core.database.model.QuestionCommentEntity
import com.harmony.core.database.model.QuestionEntity
import com.harmony.core.database.model.multimap.QuestionCommentWithUser
import com.teampatch.core.database.model.QuestionCommentEntity
import com.teampatch.core.database.model.QuestionEntity
import com.teampatch.core.database.model.multimap.QuestionCommentWithUser
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
4 changes: 2 additions & 2 deletions .../com/harmony/core/database/dao/TodoDao.kt → ...om/teampatch/core/database/dao/TodoDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
package com.harmony.core.database.dao
package com.teampatch.core.database.dao

import androidx.room.Dao
import androidx.room.Delete
import androidx.room.Insert
import androidx.room.OnConflictStrategy
import androidx.room.Query
import androidx.room.Update
import com.harmony.core.database.model.TodoEntity
import com.teampatch.core.database.model.TodoEntity
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
4 changes: 2 additions & 2 deletions .../com/harmony/core/database/dao/UserDao.kt → ...om/teampatch/core/database/dao/UserDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.harmony.core.database.dao
package com.teampatch.core.database.dao

import androidx.room.Dao
import androidx.room.Insert
import androidx.room.Query
import androidx.room.Update
import com.harmony.core.database.model.UserEntity
import com.teampatch.core.database.model.UserEntity
import kotlinx.coroutines.flow.Flow

@Dao
Expand Down
22 changes: 11 additions & 11 deletions ...armony/core/database/di/DatabaseModule.kt → ...mpatch/core/database/di/DatabaseModule.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
package com.harmony.core.database.di
package com.teampatch.core.database.di

import android.content.Context
import androidx.room.Room
import androidx.room.RoomDatabase.Callback
import androidx.sqlite.db.SupportSQLiteDatabase
import com.harmony.core.database.HarmonyDatabase
import com.harmony.core.database.dao.GroupDao
import com.harmony.core.database.dao.MemoryCardDao
import com.harmony.core.database.dao.QuestionDao
import com.harmony.core.database.dao.TodoDao
import com.harmony.core.database.dao.UserDao
import com.harmony.core.database.model.preload.MemoryCardPreloadData
import com.harmony.core.database.model.preload.QuestionPreloadData
import com.harmony.core.database.model.preload.TodoPreloadData
import com.harmony.core.database.model.preload.UserPreloadData
import com.teampatch.core.database.HarmonyDatabase
import com.teampatch.core.database.dao.GroupDao
import com.teampatch.core.database.dao.MemoryCardDao
import com.teampatch.core.database.dao.QuestionDao
import com.teampatch.core.database.dao.TodoDao
import com.teampatch.core.database.dao.UserDao
import com.teampatch.core.database.model.preload.MemoryCardPreloadData
import com.teampatch.core.database.model.preload.QuestionPreloadData
import com.teampatch.core.database.model.preload.TodoPreloadData
import com.teampatch.core.database.model.preload.UserPreloadData
import dagger.Module
import dagger.Provides
import dagger.hilt.InstallIn
Expand Down
2 changes: 1 addition & 1 deletion ...armony/core/database/model/GroupEntity.kt → ...mpatch/core/database/model/GroupEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database.model
package com.teampatch.core.database.model

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
2 changes: 1 addition & 1 deletion ...y/core/database/model/MemoryCardEntity.kt → ...h/core/database/model/MemoryCardEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database.model
package com.teampatch.core.database.model

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
2 changes: 1 addition & 1 deletion ...e/database/model/QuestionCommentEntity.kt → ...e/database/model/QuestionCommentEntity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.harmony.core.database.model
package com.teampatch.core.database.model

import androidx.room.ColumnInfo
import androidx.room.Entity
Expand Down
Loading